Adding/updating GPL licensing per Halsey

roundware · Jan 23, 2015 · 7e3930d · 7e3930d
1 parent be664d9
commit 7e3930d
Show file tree

Hide file tree

Showing 39 changed files with 849 additions and 517 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,9 +1,9 @@
 Roundware Android authors ordered by first contribution.
 
-Rob Knapen <http://www.wageningenur.nl>
 Dan Latham
+Rob Knapen <http://www.shuffledbits.com>
 Halsey Burgund <http://halseyburgund.com>
+Rob Dietrick
 Brad Erickson <http://eosrei.net>
 Joel Schnall
 Matt Adler <http://hillsandfog.com>
-
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -0,0 +1,30 @@
+Roundware Android
+A participatory, location-aware media platform.
+
+    Copyright (C) 2008-2015 Halsey Solutions, LLC
+    http://roundware.org | contact@roundware.org
+
+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/.
+
+Roundware is a registered trademark of Halsey Burgund.
+
+Roundware includes works under other copyright notices and distributed
+according to the terms of the GNU General Public License or a compatible
+license, including:
+
+NPR Android App - Copyright 2012 NPR.
+https://code.google.com/p/npr-android-app/
+
+Android - Copyright 2009 Google Inc.
+http://source.android.com/
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwApplication.java b/rwapp/src/main/java/org/roundware/rwapp/RwApplication.java
@@ -1,3 +1,8 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
+
 package org.roundware.rwapp;
 
 import android.app.Application;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwExploreActivity.java b/rwapp/src/main/java/org/roundware/rwapp/RwExploreActivity.java
@@ -1,3 +1,7 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.app.Activity;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwListenActivity.java b/rwapp/src/main/java/org/roundware/rwapp/RwListenActivity.java
@@ -1,10 +1,7 @@
-/*
-    STORIES FROM MAIN STREET
-    Android client application
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen
-    ALL RIGHTS RESERVED
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.annotation.SuppressLint;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwMainActivity.java b/rwapp/src/main/java/org/roundware/rwapp/RwMainActivity.java
@@ -1,10 +1,7 @@
-/*
-    STORIES FROM MAIN STREET
-    Android client application
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen
-    ALL RIGHTS RESERVED
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.annotation.SuppressLint;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwPrefsActivity.java b/rwapp/src/main/java/org/roundware/rwapp/RwPrefsActivity.java
@@ -1,10 +1,7 @@
-/*
-    STORIES FROM MAIN STREET
-    Android client application
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen
-    ALL RIGHTS RESERVED
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.content.SharedPreferences;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/RwSpeakActivity.java b/rwapp/src/main/java/org/roundware/rwapp/RwSpeakActivity.java
@@ -1,10 +1,7 @@
-/*
-    STORIES FROM MAIN STREET
-    Android client application
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen
-    ALL RIGHTS RESERVED
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.annotation.SuppressLint;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/Settings.java b/rwapp/src/main/java/org/roundware/rwapp/Settings.java
@@ -1,10 +1,14 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
 /**
- * Created by jschnall on 8/13/14.
+ *
  */
 public class Settings {
     // name of shared preferences used by all activities in the app

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/AssetData.java b/rwapp/src/main/java/org/roundware/rwapp/utils/AssetData.java
@@ -1,3 +1,7 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp.utils;
 
 /**

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/AssetImageManager.java b/rwapp/src/main/java/org/roundware/rwapp/utils/AssetImageManager.java
@@ -1,3 +1,7 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp.utils;
 
 import android.content.SharedPreferences;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/ClassRegistry.java b/rwapp/src/main/java/org/roundware/rwapp/utils/ClassRegistry.java
@@ -1,3 +1,7 @@
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.rwapp.utils;
 
 import java.util.Collections;

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/LevelMeterView.java b/rwapp/src/main/java/org/roundware/rwapp/utils/LevelMeterView.java
@@ -1,23 +1,6 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
  */
 package org.roundware.rwapp.utils;
 

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/Utils.java b/rwapp/src/main/java/org/roundware/rwapp/utils/Utils.java
@@ -1,23 +1,6 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
  */
 package org.roundware.rwapp.utils;
 

diff --git a/rwapp/src/main/java/org/roundware/rwapp/utils/VersionDialog.java b/rwapp/src/main/java/org/roundware/rwapp/utils/VersionDialog.java
@@ -1,23 +1,6 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
  */
 package org.roundware.rwapp.utils;
 

diff --git a/rwservice/src/main/java/org/roundware/service/RW.java b/rwservice/src/main/java/org/roundware/service/RW.java
@@ -1,23 +1,6 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
  */
 package org.roundware.service;
 

diff --git a/rwservice/src/main/java/org/roundware/service/RWAction.java b/rwservice/src/main/java/org/roundware/service/RWAction.java
@@ -1,24 +1,7 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.service;
 
 import android.content.Context;

diff --git a/rwservice/src/main/java/org/roundware/service/RWActionFactory.java b/rwservice/src/main/java/org/roundware/service/RWActionFactory.java
@@ -1,24 +1,7 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.service;
 
 import android.annotation.SuppressLint;

diff --git a/rwservice/src/main/java/org/roundware/service/RWActionQueue.java b/rwservice/src/main/java/org/roundware/service/RWActionQueue.java
@@ -1,24 +1,7 @@
-/*
-    ROUNDWARE
-    a participatory, location-aware media platform
-    Android client library
-       Copyright (C) 2008-2013 Halsey Solutions, LLC
-    with contributions by Rob Knapen (shuffledbits.com) and Dan Latham
-    http://roundware.org | contact@roundware.org
-
-    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/>.
-*/
+/**
+ * Roundware Android code is released under the terms of the GNU General Public License.
+ * See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
+ */
 package org.roundware.service;
 
 import android.content.Context;