License conversion to AGPL v3.0

DoubleDoorDevelopment · Apr 25, 2015 · a792bfe · a792bfe
1 parent 7d5facc
commit a792bfe
Show file tree

Hide file tree

Showing 60 changed files with 1,406 additions and 2,039 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -49,18 +49,27 @@ Step 3: Restart the backend. Done.
 License
 -------
 
-If we include code that you wrote, and we forgot to mention you as author, please make an issue!<br>
-
-This project is under a modified version of the BSD license.<br>
-Specifically:
-
-    The header specified or the above copyright notice, this list of conditions
-    and the following disclaimer below must be displayed at the top of the source code
-    of any web page received while using any part of the service this software provides.
-
-    The header to be displayed:
-        This page was generated by DoubleDoorDevelopment's D3Backend or a derivative thereof.
-        
-**This is to be interpreted like this:**<br>
-You can't simply change all the template files and remove all of the references to "DoubleDoorDevelopment's D3Backend"<br>
-If you wish to use the backend without any references to "DoubleDoorDevelopment" or "D3Backend", you will have to contact us and receive explicate written permission.
+    Copyright (C) 2015  Dries007 & Double Door Development
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+We would like to draw your attention to this section of the GNU Affero General Public License v3.0:
+
+    If your software can interact with users remotely through a computer
+    network, you should also make sure that it provides a way for users to
+    get its source.  For example, if your program is a web application, its
+    interface could display a "Source" link that leads users to an archive
+    of the code.  There are many ways you could offer source, and different
+    solutions will be better for different programs; see section 13 for the
+    specific requirements.
diff --git a/build.gradle b/build.gradle
@@ -34,8 +34,23 @@ configurations {
 idea {
     project {
         copyright {
-            name = "Copyright"
-            license = file("LICENSE.txt")
+            name = "AGPL v3.0"
+            license =
+                    "    D3Backend\n" +
+                    "    Copyright (C) 2015  Dries007 & Double Door Development\n" +
+                    "\n" +
+                    "    This program is free software: you can redistribute it and/or modify\n" +
+                    "    it under the terms of the GNU Affero General Public License as published\n" +
+                    "    by the Free Software Foundation, either version 3 of the License, or\n" +
+                    "    (at your option) any later version.\n" +
+                    "\n" +
+                    "    This program is distributed in the hope that it will be useful,\n" +
+                    "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+                    "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
+                    "    GNU Affero General Public License for more details.\n" +
+                    "\n" +
+                    "    You should have received a copy of the GNU Affero General Public License\n" +
+                    "    along with this program.  If not, see <http://www.gnu.org/licenses/>."
         }
         runConfigurations {
             Launcher {

diff --git a/src/main/java/net/doubledoordev/backend/Main.java b/src/main/java/net/doubledoordev/backend/Main.java
@@ -1,41 +1,19 @@
 /*
- * Unless otherwise specified through the '@author' tag or comments at
- * the top of the file or on a specific portion of the code the following license applies:
+ *     D3Backend
+ *     Copyright (C) 2015  Dries007 & Double Door Development
  *
- * Copyright (c) 2014, DoubleDoorDevelopment
- * All rights reserved.
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published
+ *     by the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ *     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 Affero General Public License for more details.
  *
- *  Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *  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.
- *
- *  The header specified or the above copyright notice, this list of conditions
- *   and the following disclaimer below must be displayed at the top of the source code
- *   of any web page received while using any part of the service this software provides.
- *
- *   The header to be displayed:
- *       This page was generated by DoubleDoorDevelopment's D3Backend or a derivative thereof.
- *
- *  Neither the name of the project nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package net.doubledoordev.backend;
@@ -135,6 +113,11 @@ public static void main(String[] args) throws Exception
             if (arg.equalsIgnoreCase("debug")) debug = true;
         }
 
+        LOGGER.info("\n\n    D3Backend  Copyright (C) 2015  Dries007 & Double Door Development\n" +
+                "    This program comes with ABSOLUTELY NO WARRANTY;\n" +
+                "    This is free software, and you are welcome to redistribute it under certain conditions;\n" +
+                "    Type `license' for details.\n\n");
+
         LOGGER.info("Making necessary folders...");
         mkdirs();
         LOGGER.info("Starting webserver...");

diff --git a/src/main/java/net/doubledoordev/backend/commands/Bindings.java b/src/main/java/net/doubledoordev/backend/commands/Bindings.java
@@ -1,42 +1,19 @@
 /*
- * Unless otherwise specified through the '@author' tag or comments at
- * the top of the file or on a specific portion of the code the following license applies:
+ *     D3Backend
+ *     Copyright (C) 2015  Dries007 & Double Door Development
  *
- * Copyright (c) 2014, DoubleDoorDevelopment
- * All rights reserved.
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published
+ *     by the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  *
- * 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.
- *
- *  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.
- *
- *  The header specified or the above copyright notice, this list of conditions
- *   and the following disclaimer below must be displayed at the top of the source code
- *   of any web page received while using any part of the service this software provides.
- *
- *   The header to be displayed:
- *       This page was generated by DoubleDoorDevelopment's D3Backend or a derivative thereof.
- *
- *  Neither the name of the project nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *     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 Affero General Public License for more details.
  *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package net.doubledoordev.backend.commands;

diff --git a/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java b/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java
@@ -1,42 +1,19 @@
 /*
- * Unless otherwise specified through the '@author' tag or comments at
- * the top of the file or on a specific portion of the code the following license applies:
+ *     D3Backend
+ *     Copyright (C) 2015  Dries007 & Double Door Development
  *
- * Copyright (c) 2014, DoubleDoorDevelopment
- * All rights reserved.
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published
+ *     by the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  *
- * 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.
- *
- *  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.
- *
- *  The header specified or the above copyright notice, this list of conditions
- *   and the following disclaimer below must be displayed at the top of the source code
- *   of any web page received while using any part of the service this software provides.
- *
- *   The header to be displayed:
- *       This page was generated by DoubleDoorDevelopment's D3Backend or a derivative thereof.
- *
- *  Neither the name of the project nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *     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 Affero General Public License for more details.
  *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package net.doubledoordev.backend.commands;
@@ -60,10 +37,7 @@
 import org.apache.logging.log4j.Logger;
 
 import javax.swing.*;
-import java.io.BufferedReader;
-import java.io.Console;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
 
 import static net.doubledoordev.backend.util.Constants.JOINER_COMMA_SPACE;
 import static net.doubledoordev.backend.util.Settings.SETTINGS;
@@ -96,26 +70,47 @@ public static void init()
     public void run()
     {
         Console console = System.console();
-        if (console == null)
-        {
-            //todo: open gui
-            JOptionPane.showMessageDialog(null, "You opened D3Backend without a console. Since we don't have a gui yet, and we need input for commands, this is not supported.\nUse a commandline enviroment to open the jar for now.");
-            System.exit(1);
-        }
-        while (Main.running)
+        if (console != null)
         {
-            try
+            while (Main.running)
             {
-                String command = console.readLine();
-                if (dispatcher.get(command.split(" ")[0]) != null) dispatcher.call(command, new CommandLocals(), new String[0]);
-                else throw new CommandNotFoundException(command);
+                try
+                {
+                    String command = console.readLine();
+                    if (dispatcher.get(command.split(" ")[0]) != null) dispatcher.call(command, new CommandLocals(), new String[0]);
+                    else throw new CommandNotFoundException(command);
+                }
+                catch (CommandException | AuthorizationException e)
+                {
+                    CMDLOGGER.warn(e);
+                    e.printStackTrace();
+                }
             }
-            catch (CommandException | AuthorizationException e)
+            return;
+        }
+        if (System.in != null && Main.debug) // Only allow when debug is on
+        {
+            BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+            while (Main.running)
             {
-                CMDLOGGER.warn(e);
-                e.printStackTrace();
+                try
+                {
+                    String command = in.readLine();
+                    if (dispatcher.get(command.split(" ")[0]) != null) dispatcher.call(command, new CommandLocals(), new String[0]);
+                    else throw new CommandNotFoundException(command);
+                }
+                catch (IOException | CommandException | AuthorizationException e)
+                {
+                    CMDLOGGER.warn(e);
+                    e.printStackTrace();
+                }
             }
+            return;
         }
+
+        //todo: open gui
+        JOptionPane.showMessageDialog(null, "You opened D3Backend without a console. Since we don't have a gui yet, and we need input for commands, this is not supported.\nUse a commandline enviroment to open the jar for now.");
+        System.exit(1);
     }
 
     @Command(aliases = {"help", "?"}, desc = "Get a list of commands", help = "Use this to get help", usage = "[Command]", max = 1)
@@ -249,4 +244,25 @@ else if (subcmd.equalsIgnoreCase("mc"))
         }
         else CMDLOGGER.info("Subcommand '{}' unknown.", subcmd);
     }
+
+    @Command(aliases = "license", desc = "Show this product's license information")
+    public void license()
+    {
+        CMDLOGGER.info(
+                "    D3Backend\n" +
+                "    Copyright (C) 2015  Dries007 & Double Door Development\n" +
+                "\n" +
+                "    This program is free software: you can redistribute it and/or modify\n" +
+                "    it under the terms of the GNU Affero General Public License as published\n" +
+                "    by the Free Software Foundation, either version 3 of the License, or\n" +
+                "    (at your option) any later version.\n" +
+                "\n" +
+                "    This program is distributed in the hope that it will be useful,\n" +
+                "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+                "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
+                "    GNU Affero General Public License for more details.\n" +
+                "\n" +
+                "    You should have received a copy of the GNU Affero General Public License\n" +
+                "    along with this program.  If not, see <http://www.gnu.org/licenses/>.");
+    }
 }