Merge branch 'sigar-1.6'

bindings/java/hyperic_jni/jni-build.xml

@@ -1,19 +1,21 @@
 <!--
-Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
-This file is part of SIGAR.
 
-SIGAR is free software; you can redistribute it and/or modify
-it under the terms version 2 of the GNU General Public License as
-published by the Free Software Foundation. This program is distributed
-in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU General Public License for more
-details.
+ Copyright (c) 2009 Hyperic, Inc.
+ Copyright (c) 2009 SpringSource, Inc.
+ Copyright (c) 2009-2010 VMware, Inc.
+
+ Licensed 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 should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
 -->
 
   <property environment="env"/>