merge with head

lightoze · Feb 28, 2011 · d9c4600 · d9c4600
2 parents e33f766 + b6ba733
commit d9c4600
Show file tree

Hide file tree

Showing 303 changed files with 2,326 additions and 1,582 deletions.
diff --git a/README.txt b/README.txt
@@ -1,32 +1,3 @@
-====
-    openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
-
-    See the contributors.txt file in the distribution for a
-    full listing of individual contributors.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 3 of the
-    License, or (at your option) any later version.
-
-    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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-
-    If you modify this Program, or any covered work, by linking or
-    combining it with Eclipse (or a modified version of that library),
-    containing parts covered by the terms of the Eclipse Public License
-    (EPL), the licensors of this Program grant you additional permission
-    to convey the resulting work.
-====
-
 openHAB Build instructions
 ==========================
 

diff --git a/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/bluetoothbinding.xml b/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/bluetoothbinding.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/configuration.xml b/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/configuration.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/discoveryservice.xml b/bundles/binding/org.openhab.binding.bluetooth/OSGI-INF/discoveryservice.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.bluetooth/build.properties b/bundles/binding/org.openhab.binding.bluetooth/build.properties
@@ -1,32 +1,3 @@
-#
-# openHAB, the open Home Automation Bus.
-# Copyright (C) 2010, openHAB.org <admin@openhab.org>
-#
-# See the contributors.txt file in the distribution for a
-# full listing of individual contributors.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with Eclipse (or a modified version of that library),
-# containing parts covered by the terms of the Eclipse Public License
-# (EPL), the licensors of this Program grant you additional permission
-# to convey the resulting work.
-#
-
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\

diff --git a/....binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/BluetoothEventHandler.java b/....binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/BluetoothEventHandler.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...etooth/src/main/java/org/openhab/binding/bluetooth/internal/BTDeviceDiscoveryService.java b/...etooth/src/main/java/org/openhab/binding/bluetooth/internal/BTDeviceDiscoveryService.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...ng.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothActivator.java b/...ng.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothActivator.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...ding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothBinding.java b/...ding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothBinding.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...nding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothConfig.java b/...nding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothConfig.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...nding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothDevice.java b/...nding.bluetooth/src/main/java/org/openhab/binding/bluetooth/internal/BluetoothDevice.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/....test/src/test/java/org/openhab/binding/exec/internal/ExecGenericBindingProviderTest.java b/....test/src/test/java/org/openhab/binding/exec/internal/ExecGenericBindingProviderTest.java
@@ -1,3 +1,32 @@
+/**
+ * openHAB, the open Home Automation Bus.
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
+ *
+ * See the contributors.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ *
+ * Additional permission under GNU GPL version 3 section 7
+ *
+ * If you modify this Program, or any covered work, by linking or
+ * combining it with Eclipse (or a modified version of that library),
+ * containing parts covered by the terms of the Eclipse Public License
+ * (EPL), the licensors of this Program grant you additional permission
+ * to convey the resulting work.
+ */
+
 package org.openhab.binding.exec.internal;
 
 import junit.framework.Assert;

diff --git a/bundles/binding/org.openhab.binding.exec/OSGI-INF/binding.xml b/bundles/binding/org.openhab.binding.exec/OSGI-INF/binding.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.exec/OSGI-INF/genericbindingprovider.xml b/bundles/binding/org.openhab.binding.exec/OSGI-INF/genericbindingprovider.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.exec/build.properties b/bundles/binding/org.openhab.binding.exec/build.properties
@@ -1,32 +1,3 @@
-#
-# openHAB, the open Home Automation Bus.
-# Copyright (C) 2010, openHAB.org <admin@openhab.org>
-#
-# See the contributors.txt file in the distribution for a
-# full listing of individual contributors.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with Eclipse (or a modified version of that library),
-# containing parts covered by the terms of the Eclipse Public License
-# (EPL), the licensors of this Program grant you additional permission
-# to convey the resulting work.
-#
-
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\

diff --git a/.../org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/ExecBindingProvider.java b/.../org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/ExecBindingProvider.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...g.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecActivator.java b/...g.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecActivator.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecBinding.java b/...org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecBinding.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...ding.exec/src/main/java/org/openhab/binding/exec/internal/ExecGenericBindingProvider.java b/...ding.exec/src/main/java/org/openhab/binding/exec/internal/ExecGenericBindingProvider.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.exec/src/main/resources/readme.txt b/bundles/binding/org.openhab.binding.exec/src/main/resources/readme.txt
@@ -1,30 +1 @@
-====
-    openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
-
-    See the contributors.txt file in the distribution for a
-    full listing of individual contributors.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 3 of the
-    License, or (at your option) any later version.
-
-    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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-
-    If you modify this Program, or any covered work, by linking or
-    combining it with Eclipse (or a modified version of that library),
-    containing parts covered by the terms of the Eclipse Public License
-    (EPL), the licensors of this Program grant you additional permission
-    to convey the resulting work.
-====
-
 Bundle resources go in here!
diff --git a/....test/src/test/java/org/openhab/binding/http/internal/HttpGenericBindingProviderTest.java b/....test/src/test/java/org/openhab/binding/http/internal/HttpGenericBindingProviderTest.java
@@ -1,3 +1,32 @@
+/**
+ * openHAB, the open Home Automation Bus.
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
+ *
+ * See the contributors.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ *
+ * Additional permission under GNU GPL version 3 section 7
+ *
+ * If you modify this Program, or any covered work, by linking or
+ * combining it with Eclipse (or a modified version of that library),
+ * containing parts covered by the terms of the Eclipse Public License
+ * (EPL), the licensors of this Program grant you additional permission
+ * to convey the resulting work.
+ */
+
 package org.openhab.binding.http.internal;
 
 import java.util.ArrayList;

diff --git a/bundles/binding/org.openhab.binding.http/OSGI-INF/inbinding.xml b/bundles/binding/org.openhab.binding.http/OSGI-INF/inbinding.xml
@@ -2,7 +2,7 @@
 <!--
 
     openHAB, the open Home Automation Bus.
-    Copyright (C) 2010, openHAB.org <admin@openhab.org>
+    Copyright (C) 2011, openHAB.org <admin@openhab.org>
 
     See the contributors.txt file in the distribution for a
     full listing of individual contributors.

diff --git a/bundles/binding/org.openhab.binding.http/build.properties b/bundles/binding/org.openhab.binding.http/build.properties
@@ -1,32 +1,3 @@
-#
-# openHAB, the open Home Automation Bus.
-# Copyright (C) 2010, openHAB.org <admin@openhab.org>
-#
-# See the contributors.txt file in the distribution for a
-# full listing of individual contributors.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses>.
-#
-# Additional permission under GNU GPL version 3 section 7
-#
-# If you modify this Program, or any covered work, by linking or
-# combining it with Eclipse (or a modified version of that library),
-# containing parts covered by the terms of the Eclipse Public License
-# (EPL), the licensors of this Program grant you additional permission
-# to convey the resulting work.
-#
-
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\

diff --git a/...g.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpActivator.java b/...g.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpActivator.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.

diff --git a/...g.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpInBinding.java b/...g.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpInBinding.java
@@ -1,6 +1,6 @@
 /**
  * openHAB, the open Home Automation Bus.
- * Copyright (C) 2010, openHAB.org <admin@openhab.org>
+ * Copyright (C) 2011, openHAB.org <admin@openhab.org>
  *
  * See the contributors.txt file in the distribution for a
  * full listing of individual contributors.