Give it the right license osgi
authorJaroslav Tulach <jaroslav.tulach@netbeans.org>
Mon, 06 Jan 2014 09:43:52 +0100
branchosgi
changeset 4175e69676597a7
parent 416 6b38d4c953c3
child 418 dff5e3d6073e
Give it the right license
json/src/main/java/org/apidesign/html/json/spi/package.html
     1.1 --- a/json/src/main/java/org/apidesign/html/json/spi/package.html	Mon Jan 06 09:38:00 2014 +0100
     1.2 +++ b/json/src/main/java/org/apidesign/html/json/spi/package.html	Mon Jan 06 09:43:52 2014 +0100
     1.3 @@ -1,44 +1,46 @@
     1.4 -<!DOCTYPE html>
     1.5  <!--
     1.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.7  
     1.8 -Copyright 2014 Oracle and/or its affiliates. All rights reserved.
     1.9 +    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    1.10  
    1.11 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.12 -Other names may be trademarks of their respective owners.
    1.13 +    Copyright 2013-2013 Oracle and/or its affiliates. All rights reserved.
    1.14  
    1.15 -The contents of this file are subject to the terms of either the GNU
    1.16 -General Public License Version 2 only ("GPL") or the Common
    1.17 -Development and Distribution License("CDDL") (collectively, the
    1.18 -"License"). You may not use this file except in compliance with the
    1.19 -License. You can obtain a copy of the License at
    1.20 -http://www.netbeans.org/cddl-gplv2.html
    1.21 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.22 -specific language governing permissions and limitations under the
    1.23 -License.  When distributing the software, include this License Header
    1.24 -Notice in each file and include the License file at
    1.25 -nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.26 -particular file as subject to the "Classpath" exception as provided
    1.27 -by Oracle in the GPL Version 2 section of the License file that
    1.28 -accompanied this code. If applicable, add the following below the
    1.29 -License Header, with the fields enclosed by brackets [] replaced by
    1.30 -your own identifying information:
    1.31 -"Portions Copyrighted [year] [name of copyright owner]"
    1.32 +    Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.33 +    Other names may be trademarks of their respective owners.
    1.34  
    1.35 -If you wish your version of this file to be governed by only the CDDL
    1.36 -or only the GPL Version 2, indicate your decision by adding
    1.37 -"[Contributor] elects to include this software in this distribution
    1.38 -under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.39 -single choice of license, a recipient has the option to distribute
    1.40 -your version of this file under either the CDDL, the GPL Version 2 or
    1.41 -to extend the choice of license to its licensees as provided above.
    1.42 -However, if you add GPL Version 2 code and therefore, elected the GPL
    1.43 -Version 2 license, then the option applies only if the new code is
    1.44 -made subject to such option by the copyright holder.
    1.45 +    The contents of this file are subject to the terms of either the GNU
    1.46 +    General Public License Version 2 only ("GPL") or the Common
    1.47 +    Development and Distribution License("CDDL") (collectively, the
    1.48 +    "License"). You may not use this file except in compliance with the
    1.49 +    License. You can obtain a copy of the License at
    1.50 +    http://www.netbeans.org/cddl-gplv2.html
    1.51 +    or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.52 +    specific language governing permissions and limitations under the
    1.53 +    License.  When distributing the software, include this License Header
    1.54 +    Notice in each file and include the License file at
    1.55 +    nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.56 +    particular file as subject to the "Classpath" exception as provided
    1.57 +    by Oracle in the GPL Version 2 section of the License file that
    1.58 +    accompanied this code. If applicable, add the following below the
    1.59 +    License Header, with the fields enclosed by brackets [] replaced by
    1.60 +    your own identifying information:
    1.61 +    "Portions Copyrighted [year] [name of copyright owner]"
    1.62  
    1.63 -Contributor(s):
    1.64 +    Contributor(s):
    1.65  
    1.66 -Portions Copyrighted 2014 Sun Microsystems, Inc.
    1.67 +    The Original Software is NetBeans. The Initial Developer of the Original
    1.68 +    Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
    1.69 +
    1.70 +    If you wish your version of this file to be governed by only the CDDL
    1.71 +    or only the GPL Version 2, indicate your decision by adding
    1.72 +    "[Contributor] elects to include this software in this distribution
    1.73 +    under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.74 +    single choice of license, a recipient has the option to distribute
    1.75 +    your version of this file under either the CDDL, the GPL Version 2 or
    1.76 +    to extend the choice of license to its licensees as provided above.
    1.77 +    However, if you add GPL Version 2 code and therefore, elected the GPL
    1.78 +    Version 2 license, then the option applies only if the new code is
    1.79 +    made subject to such option by the copyright holder.
    1.80 +
    1.81  -->
    1.82  <html>
    1.83      <body>