Merge pull request #789 from vikasprabhakar/code_donation_websvc_core

[NETBEANS-1074] Module Review websvc.core
apache · Aug 28, 2018 · a73c477 · a73c477
2 parents ef3e848 + 0f9b33a
commit a73c477
Show file tree

Hide file tree

Showing 13 changed files with 800 additions and 477 deletions.
diff --git a/websvc.core/build.xml b/websvc.core/build.xml
@@ -21,10 +21,4 @@
 -->
 <project basedir="." default="netbeans" name="websvc.core">
     <import file="../nbbuild/templates/projectized.xml"/>
-    <property name="resources.dir" value="./src/org/netbeans/modules/websvc/core/resources/"/>
-
-    <target name="build-init" depends="projectized.build-init">
-        <unzip src="external/websvc.core-external-resources.zip" dest="${resources.dir}"/>
-    </target>
-
 </project>
diff --git a/websvc.core/external/binaries-list b/websvc.core/external/binaries-list
diff --git a/websvc.core/external/glassfish-license.txt b/websvc.core/external/glassfish-license.txt
diff --git a/websvc.core/licenseinfo.xml b/websvc.core/licenseinfo.xml
@@ -0,0 +1,72 @@
+<?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/websvc/editor/completion/resources/fileProtocol.gif</file>
+        <file>src/org/netbeans/modules/websvc/editor/completion/resources/fileProtocol32.gif</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/error-badge.gif</file>
+        <file>src/org/netbeans/modules/websvc/core/wseditor/support/Context.gif</file>
+        <file>src/org/netbeans/modules/websvc/core/client/resources/webServiceBadge.gif</file>
+        <file>src/org/netbeans/modules/websvc/editor/completion/resources/field_static_16.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/XMLServiceDataIcon.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/clientgroup.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/folder.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/folderOpen.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/waiting.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/webservice.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/webservicegroup.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/wsoperation.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/wsport.png</file>
+        <file>src/org/netbeans/modules/websvc/core/webservices/ui/resources/wsportOpen.png</file>
+        <file>src/org/netbeans/modules/websvc/core/resources/WSSchemaCatalog.png</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/XMLServiceDataIcon.png</file>
+        <file>src/org/netbeans/modules/websvc/core/client/resources/ws_client_16.png</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="COMMENT_UNSUPPORTED" />
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/EjbWebServiceNoOp.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/EjbWebServiceProvider.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/WebService.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/WebServiceNoOp.template</file>
+        <file>src/org/netbeans/modules/websvc/core/dev/resources/WebServiceProvider.template</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP"/>
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/websvc/core/resources/sun-jaxws.xsd</file>
+        <license ref="CDDL-1.0" />
+        <comment type="CATEGORY_B"/>
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/websvc/core/resources/javaee_web_services_metadata_handler_2_0.xsd</file>
+        <file>src/org/netbeans/modules/websvc/core/resources/wsdl_customizationschema_2_0.xsd</file>
+        <license ref="CDDL-1.1" />
+        <comment type="CATEGORY_B"/>
+    </fileset>
+</licenseinfo>
+
diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/Bundle.properties b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/Bundle.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 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.
-# Sample ResourceBundle properties file
+# 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.
 
 LBL_SpecifyWSInfo=Specify Web Service Information
 LBL_Create_WS_Title=Web Service

diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/nodes/ServiceNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/nodes/ServiceNode.java
@@ -1,46 +1,22 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 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
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Serviceions Copyright 1997-2006 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.
  */
+
 package org.netbeans.modules.websvc.core.dev.wizard.nodes;
 
 import java.awt.Image;

diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/nodes/WsdlNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/nodes/WsdlNode.java
@@ -1,46 +1,22 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 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
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Serviceions Copyright 1997-2006 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.
  */
+
 package org.netbeans.modules.websvc.core.dev.wizard.nodes;
 
 import java.awt.Image;

diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ServiceNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ServiceNode.java
@@ -1,46 +1,22 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 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
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Serviceions Copyright 1997-2006 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.
  */
+
 package org.netbeans.modules.websvc.core.jaxws.nodes;
 
 import java.awt.Image;