Skip to content

Commit

Permalink
Changed license from GPL to EPL
Browse files Browse the repository at this point in the history
  • Loading branch information
kaikreuzer committed Oct 12, 2013
1 parent 2eb9631 commit 69cfed0
Show file tree
Hide file tree
Showing 1,511 changed files with 7,663 additions and 75,268 deletions.
692 changes: 44 additions & 648 deletions LICENSE.TXT

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Private-Package: org.openhab.action.mail.internal
Ignore-Package: org.openhab.action.mail.internal
Bundle-License: http://www.gnu.org/licenses/gpl.html
Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Bundle-Name: openHAB Mail Action
Bundle-SymbolicName: org.openhab.action.mail
Bundle-Vendor: openHAB.org
Expand Down
33 changes: 7 additions & 26 deletions bundles/action/org.openhab.action.mail/OSGI-INF/action.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<!--
openHAB, the open Home Automation Bus.
Copyright (C) 2010-2013, openHAB.org <[email protected]>
Copyright (c) 2010-2013, openHAB.org and others.
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. -->
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.openhab.action.mail.action">
<implementation class="org.openhab.action.mail.internal.MailActionService" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.mail.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.mail.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.mail.internal;

Expand Down
2 changes: 1 addition & 1 deletion bundles/action/org.openhab.action.nma/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Private-Package: org.openhab.action.nma.internal
Ignore-Package: org.openhab.action.nma.internal
Bundle-License: http://www.gnu.org/licenses/gpl.html
Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Bundle-Name: openHAB NotifyMyAndroid Action
Bundle-SymbolicName: org.openhab.action.nma
Bundle-Vendor: openHAB.org
Expand Down
33 changes: 7 additions & 26 deletions bundles/action/org.openhab.action.nma/OSGI-INF/action.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<!--
openHAB, the open Home Automation Bus.
Copyright (C) 2010-2013, openHAB.org <[email protected]>
Copyright (c) 2010-2013, openHAB.org and others.
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. -->
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.openhab.action.nma.action">
<implementation class="org.openhab.action.nma.internal.NotifyMyAndroidActionService" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.nma.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.nma.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
/**
* openHAB, the open Home Automation Bus.
* Copyright (C) 2010-2013, openHAB.org <[email protected]>
* Copyright (c) 2010-2013, openHAB.org and others.
*
* 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.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.action.nma.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Private-Package: org.openhab.action.prowl.internal
Ignore-Package: org.openhab.action.prowl.internal
Bundle-License: http://www.gnu.org/licenses/gpl.html
Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Bundle-Name: openHAB Prowl Action
Bundle-SymbolicName: org.openhab.action.prowl
Bundle-Vendor: openHAB.org
Expand Down
33 changes: 7 additions & 26 deletions bundles/action/org.openhab.action.prowl/OSGI-INF/action.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<!--
openHAB, the open Home Automation Bus.
Copyright (C) 2010-2013, openHAB.org <[email protected]>
Copyright (c) 2010-2013, openHAB.org and others.
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. -->
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.openhab.action.prowl.action">
<implementation class="org.openhab.action.prowl.internal.ProwlActionService" />

Expand Down
Loading

0 comments on commit 69cfed0

Please sign in to comment.