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 2018/08/29 17:29:08 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module
Review web.el (#744)
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
The following commit(s) were added to refs/heads/master by this push:
new a494e81 [NETBEANS-1074] Module Review web.el (#744)
a494e81 is described below
commit a494e817794d88b99e79bfe061082ebc2fa394ec
Author: Gilberto Caetano de Andrade <gi...@gmail.com>
AuthorDate: Wed Aug 29 14:29:04 2018 -0300
[NETBEANS-1074] Module Review web.el (#744)
* Add licenseinfor file with media
* Add the license header for test-data folders
---
web.el/licenseinfo.xml | 35 ++++++++++++++++++++++
.../unit/data/projects/testWebProject/build.xml | 20 +++++++++++++
.../testWebProject/nbproject/ant-deploy.xml | 20 +++++++++++++
.../projects/testWebProject/nbproject/project.xml | 20 +++++++++++++
.../testWebProject/src/java/NoPkgBean.java | 19 ++++++++++++
.../testWebProject/src/java/beans/Bean.java | 18 +++++++++--
.../testWebProject/src/java/beans/Cypris.java | 19 +++++++++++-
.../src/java/beans/Messages.properties | 16 ++++++++++
.../testWebProject/src/java/issue239883/Apple.java | 19 +++++++++++-
.../src/java/issue239883/AppleBean.java | 19 +++++++++++-
.../src/java/issue239883/FormBean.java | 19 +++++++++++-
.../src/java/issue253605/Test253605.java | 19 +++++++++++-
.../src/java/issue253605/Test253605Enum.java | 19 +++++++++++-
.../projects/testWebProject/web/WEB-INF/web.xml | 20 +++++++++++++
14 files changed, 274 insertions(+), 8 deletions(-)
diff --git a/web.el/licenseinfo.xml b/web.el/licenseinfo.xml
new file mode 100644
index 0000000..eabd005
--- /dev/null
+++ b/web.el/licenseinfo.xml
@@ -0,0 +1,35 @@
+<?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.
+
+-->
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/web/el/completion/resources/class_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/bean_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/propertiesKey.gif</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/function_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/property_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/jsf_bean_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/map_16.png</file>
+ <file>src/org/netbeans/modules/web/el/completion/resources/propertiesLocale.gif</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/web.el/test/unit/data/projects/testWebProject/build.xml b/web.el/test/unit/data/projects/testWebProject/build.xml
index 9898213..b756e0a 100644
--- a/web.el/test/unit/data/projects/testWebProject/build.xml
+++ b/web.el/test/unit/data/projects/testWebProject/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.) -->
diff --git a/web.el/test/unit/data/projects/testWebProject/nbproject/ant-deploy.xml b/web.el/test/unit/data/projects/testWebProject/nbproject/ant-deploy.xml
index b03100d..c5acfd0 100644
--- a/web.el/test/unit/data/projects/testWebProject/nbproject/ant-deploy.xml
+++ b/web.el/test/unit/data/projects/testWebProject/nbproject/ant-deploy.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 default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
diff --git a/web.el/test/unit/data/projects/testWebProject/nbproject/project.xml b/web.el/test/unit/data/projects/testWebProject/nbproject/project.xml
index e2112e3..7e884fc 100644
--- a/web.el/test/unit/data/projects/testWebProject/nbproject/project.xml
+++ b/web.el/test/unit/data/projects/testWebProject/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.web.project</type>
<configuration>
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/NoPkgBean.java b/web.el/test/unit/data/projects/testWebProject/src/java/NoPkgBean.java
index 3aef060..6ff85d4 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/NoPkgBean.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/NoPkgBean.java
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
*
* @author Martin Fousek <ma...@netbeans.org>
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Bean.java b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Bean.java
index 7524a4a..4063634 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Bean.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Bean.java
@@ -1,6 +1,20 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.
*/
package beans;
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Cypris.java b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Cypris.java
index 68eb7be..3b82756 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Cypris.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Cypris.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package beans;
/**
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Messages.properties b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Messages.properties
index 795f3b5..ca5ab11 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/beans/Messages.properties
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/beans/Messages.properties
@@ -1,3 +1,19 @@
+# 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.
mojePropertaA=A
mojePropertaB=B
mojePropertaC=C
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/Apple.java b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/Apple.java
index 0f82679..0f73be2 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/Apple.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/Apple.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package issue239883;
public class Apple {
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/AppleBean.java b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/AppleBean.java
index b08e6e3..569c61a 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/AppleBean.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/AppleBean.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package issue239883;
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/FormBean.java b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/FormBean.java
index 71260f1..0bf9adc 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/FormBean.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/issue239883/FormBean.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package issue239883;
public class FormBean<T> {
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605.java b/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605.java
index c732dce..cc50c7e 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package issue253605;
import javax.faces.bean.ManagedBean;
diff --git a/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605Enum.java b/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605Enum.java
index 22d5aea..1e77b73 100644
--- a/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605Enum.java
+++ b/web.el/test/unit/data/projects/testWebProject/src/java/issue253605/Test253605Enum.java
@@ -1,4 +1,21 @@
-
+/*
+ * 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.
+ */
package issue253605;
diff --git a/web.el/test/unit/data/projects/testWebProject/web/WEB-INF/web.xml b/web.el/test/unit/data/projects/testWebProject/web/WEB-INF/web.xml
index 1035900..809834e 100644
--- a/web.el/test/unit/data/projects/testWebProject/web/WEB-INF/web.xml
+++ b/web.el/test/unit/data/projects/testWebProject/web/WEB-INF/web.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.
+
+-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists