This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new aba2764 [NETBEANS-1074] Add lincenseinfo.xml files to php modules
aba2764 is described below
commit aba2764ba8036746925305c3d073bf43d201345e
Author: Junichi Yamamoto <[email protected]>
AuthorDate: Sat Sep 1 10:09:22 2018 +0900
[NETBEANS-1074] Add lincenseinfo.xml files to php modules
- Add image files to licenseinfo.xml
---
php/{php.samples => php.api.phpmodule}/licenseinfo.xml | 13 ++++++-------
php/{php.samples => php.code.analysis}/licenseinfo.xml | 14 +++++++-------
php/{php.samples => php.composer}/licenseinfo.xml | 15 ++++++++-------
php/{php.samples => php.dbgp}/licenseinfo.xml | 13 ++++++-------
php/{php.samples => php.nette2}/licenseinfo.xml | 12 +++++-------
php/php.samples/licenseinfo.xml | 4 ++++
php/{php.samples => php.symfony}/licenseinfo.xml | 12 +++++-------
php/{php.samples => php.symfony2}/licenseinfo.xml | 12 +++++-------
php/{php.samples => php.zend}/licenseinfo.xml | 12 +++++-------
php/{php.samples => php.zend2}/licenseinfo.xml | 12 +++++-------
10 files changed, 56 insertions(+), 63 deletions(-)
diff --git a/php/php.samples/licenseinfo.xml
b/php/php.api.phpmodule/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.api.phpmodule/licenseinfo.xml
index d4507d8..bdb5bec 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.api.phpmodule/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,21 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/api/ui/resources/defaultFolder.gif</file>
+
<file>src/org/netbeans/modules/php/api/ui/resources/defaultFolderOpen.gif</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml
b/php/php.code.analysis/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.code.analysis/licenseinfo.xml
index d4507d8..fd4216b 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.code.analysis/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,22 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/analysis/ui/resources/code-sniffer.png</file>
+
<file>src/org/netbeans/modules/php/analysis/ui/resources/coding-standards-fixer.png</file>
+
<file>src/org/netbeans/modules/php/analysis/ui/resources/mess-detector.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.composer/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.composer/licenseinfo.xml
index d4507d8..ee78e99 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.composer/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,23 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/composer/ui/resources/libraries-badge.png</file>
+
<file>src/org/netbeans/modules/php/composer/ui/resources/libraries-dev-badge.gif</file>
+
<file>src/org/netbeans/modules/php/composer/ui/resources/libraries.gif</file>
+
<file>src/org/netbeans/modules/php/composer/ui/resources/phpConvertorProject.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.dbgp/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.dbgp/licenseinfo.xml
index d4507d8..bc74327 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.dbgp/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,21 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/dbgp/resources/notice-glyph.gif</file>
+ <file>src/org/netbeans/modules/php/dbgp/resources/undefined.gif</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.nette2/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.nette2/licenseinfo.xml
index d4507d8..751ea66 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.nette2/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,20 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/nette2/ui/resources/nette_badge_8.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.samples/licenseinfo.xml
index d4507d8..3a258d5 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.samples/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,13 +8,16 @@
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.
+
-->
<licenseinfo>
<fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.symfony/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.symfony/licenseinfo.xml
index d4507d8..1c47d38 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.symfony/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,20 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/symfony/ui/resources/symfony_badge_8.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.symfony2/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.symfony2/licenseinfo.xml
index d4507d8..c1ef4df 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.symfony2/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,20 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/symfony2/ui/resources/symfony_badge_8.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.zend/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.zend/licenseinfo.xml
index d4507d8..f91aa04 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.zend/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,20 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/zend/ui/resources/zend_badge_8.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/php/php.samples/licenseinfo.xml b/php/php.zend2/licenseinfo.xml
similarity index 67%
copy from php/php.samples/licenseinfo.xml
copy to php/php.zend2/licenseinfo.xml
index d4507d8..f471597 100644
--- a/php/php.samples/licenseinfo.xml
+++ b/php/php.zend2/licenseinfo.xml
@@ -1,5 +1,6 @@
<?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
@@ -7,23 +8,20 @@
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.
+
-->
<licenseinfo>
<fileset>
- <file>samples_src/Calculator-Codeception/composer.json</file>
- <file>samples_src/Calculator-Nette-Tester/composer.json</file>
- <file>samples_src/Calculator-PHPUnit/composer.json</file>
- <file>samples_src/Calculator-atoum/composer.json</file>
- <file>samples_src/TodoList/web/favicon.ico</file>
- <file>samples_src/TodoList/web/img/NB-IDE-logo.png</file>
- <file>src/org/netbeans/modules/php/samples/icons/calculator.png</file>
+
<file>src/org/netbeans/modules/php/zend2/ui/resources/zend_badge_8.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
