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:11 UTC
[4/8] incubator-netbeans git commit: [NETBEANS-54] Module Review
autoupdate.services
[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;