ipa320 · fmessmer · Aug 8, 2017 · Jul 18, 2017
diff --git a/cob_bringup_sim/package.xml b/cob_bringup_sim/package.xml
@@ -3,7 +3,7 @@
   <version>0.6.7</version>
   <description>This package provides launch files for starting a simulated Care-O-bot.</description>
 
-  <license>LGPL</license>
+  <license>Apache 2.0</license>
 
   <url type="website">http://ros.org/wiki/cob_bringup_sim</url>
   <!-- <url type="bugtracker"></url> -->

diff --git a/cob_bringup_sim/scripts/move_object.py b/cob_bringup_sim/scripts/move_object.py
@@ -1,61 +1,20 @@
-#!/usr/bin/python
-#################################################################
-##\file
+#!/usr/bin/env python
 #
-# \note
-# Copyright (c) 2010 \n
-# Fraunhofer Institute for Manufacturing Engineering
-# and Automation (IPA) \n\n
+# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
 #
-#################################################################
+# 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
 #
-# \note
-# Project name: Care-O-bot Research
-# \note
-# ROS stack name: cob_simulation
-# \note
-# ROS package name: cob_bringup_sim
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# \author
-# Author: Nadia Hammoudeh Garcia, email:nadia.hammoudeh.garcia@ipa.fhg.de
-# \author
-# Supervised by: Nadia Hammoudeh Garcia, email:nadia.hammoudeh.garcia@ipa.fhg.de
-#
-# \date Date of creation: Oct 2013
-#
-# \brief
-# Implements move object functionalities.
-#
-#################################################################
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. \n
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution. \n
-# - Neither the name of the Fraunhofer Institute for Manufacturing
-# Engineering and Automation (IPA) nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission. \n
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License LGPL 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 Lesser General Public License LGPL for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License LGPL along with this program.
-# If not, see < http://www.gnu.org/licenses/>.
-#
-#################################################################
+# 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.
+
+
 import sys
 
 

diff --git a/cob_bringup_sim/scripts/remove_object.py b/cob_bringup_sim/scripts/remove_object.py
@@ -1,61 +1,20 @@
-#!/usr/bin/python
-#################################################################
-##\file
+#!/usr/bin/env python
 #
-# \note
-# Copyright (c) 2010 \n
-# Fraunhofer Institute for Manufacturing Engineering
-# and Automation (IPA) \n\n
+# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
 #
-#################################################################
+# 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
 #
-# \note
-# Project name: Care-O-bot Research
-# \note
-# ROS stack name: cob_environments
-# \note
-# ROS package name: cob_gazebo_objects
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# \author
-# Author: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de
-# \author
-# Supervised by: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de
-#
-# \date Date of creation: Feb 2012
-#
-# \brief
-# Implements script server functionalities.
-#
-#################################################################
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. \n
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution. \n
-# - Neither the name of the Fraunhofer Institute for Manufacturing
-# Engineering and Automation (IPA) nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission. \n
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License LGPL 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 Lesser General Public License LGPL for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License LGPL along with this program.
-# If not, see < http://www.gnu.org/licenses/>.
-#
-#################################################################
+# 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.
+
+
 import sys
 
 import rospy

diff --git a/cob_bringup_sim/scripts/spawn_object.py b/cob_bringup_sim/scripts/spawn_object.py
@@ -1,58 +1,20 @@
-#!/usr/bin/python
-#################################################################
-##\file
+#!/usr/bin/env python
 #
-# \note
-# Copyright (c) 2010 \n
-# Fraunhofer Institute for Manufacturing Engineering
-# and Automation (IPA) \n\n
+# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
 #
-#################################################################
+# 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
 #
-# \note
-# Project name: Care-O-bot
-# \note
-# ROS package name: cob_bringup_sim
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# \author
-# Author: Nadia Hammoudeh Garcia, email:nadia.hammoudeh.garcia@ipa.fhg.de
-#
-# \date Date of creation: Nov 2013
-#
-# \brief
-# This script is able to spawn objects into gazebo which are uploaded
-# to the parameter server under /objects
-#
-#################################################################
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. \n
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution. \n
-# - Neither the name of the Fraunhofer Institute for Manufacturing
-# Engineering and Automation (IPA) nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission. \n
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License LGPL 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 Lesser General Public License LGPL for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License LGPL along with this program.
-# If not, see < http://www.gnu.org/licenses/>.
-#
-#################################################################
+# 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.
+
+
 import sys
 import os
 

diff --git a/cob_gazebo/package.xml b/cob_gazebo/package.xml
@@ -3,7 +3,7 @@
   <version>0.6.7</version>
   <description>Launch files and tools for 3D simulation of Care-O-bot in gazebo simulator.</description>
 
-  <license>LGPL</license>
+  <license>Apache 2.0</license>
 
   <url type="website">http://ros.org/wiki/cob_gazebo</url>
   <!-- <url type="bugtracker"></url> -->

diff --git a/cob_gazebo/ros/test/component_test.py b/cob_gazebo/ros/test/component_test.py
@@ -1,4 +1,19 @@
 #!/usr/bin/env python
+#
+# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
+#
+# 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.
+
 
 import sys
 import time

diff --git a/cob_gazebo_objects/package.xml b/cob_gazebo_objects/package.xml
@@ -3,7 +3,7 @@
   <version>0.6.7</version>
   <description>This package provides some objects and furniture for gazebo simulation.</description>
 
-  <license>LGPL</license>
+  <license>Apache 2.0</license>
 
   <url type="website">http://ros.org/wiki/cob_gazebo_objects</url>
   <!-- <url type="bugtracker"></url> -->

diff --git a/cob_gazebo_worlds/package.xml b/cob_gazebo_worlds/package.xml
@@ -3,7 +3,7 @@
   <version>0.6.7</version>
   <description>This package provides some worlds for gazebo simulation.</description>
 
-  <license>LGPL</license>
+  <license>Apache 2.0</license>
 
   <url type="website">http://ros.org/wiki/cob_gazebo_worlds</url>
   <!-- <url type="bugtracker"></url> -->

diff --git a/cob_gazebo_worlds/scripts/elevator.py b/cob_gazebo_worlds/scripts/elevator.py
@@ -1,59 +1,19 @@
-#!/usr/bin/python
-#################################################################
-##\file
+#!/usr/bin/env python
 #
-# \note
-# Copyright (c) 2012 \n
-# Fraunhofer Institute for Manufacturing Engineering
-# and Automation (IPA) \n\n
+# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
 #
-#################################################################
+# 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
 #
-# \note
-# Project name: Care-O-bot
-# \note
-# ROS stack name: cob_simulation
-# \note
-# ROS package name: cob_gazebo_worlds
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# \author
-# Author: Nadia Hammoudeh Garcia
-# \author
-# Supervised by: Nadia Hammoudeh Garcia
-#
-# \date Date of creation: 26.06.2012
-#
-#
-#################################################################
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. \n
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution. \n
-# - Neither the name of the Fraunhofer Institute for Manufacturing
-# Engineering and Automation (IPA) nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission. \n
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License LGPL 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 Lesser General Public License LGPL for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License LGPL along with this program.
-# If not, see <http://www.gnu.org/licenses/>.
-#
-#################################################################
+# 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.
+
 
 import time
 import sys