Committed some old changes to prototype

codingchili · Aug 18, 2017 · 913eec8 · 913eec8
1 parent d4e1aef
commit 913eec8
Show file tree

Hide file tree

Showing 15 changed files with 1,243 additions and 1,251 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,101 +1,101 @@
-apply plugin: 'java'
-apply plugin: 'idea'
-
-project.version = "1.0.3-SNAPSHOT"
-project.group = 'com.codingchili'
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'idea'
-
-    version = rootProject.version
-    group = rootProject.group
-
-    sourceCompatibility = 1.9
-    targetCompatibility = 1.9
-
-    tasks.withType(JavaCompile) {
-        options.encoding = 'UTF-8'
-    }
-
-    sourceSets {
-        main {
-            java {
-                srcDir 'main/java'
-            }
-            resources {
-                srcDir 'main/resources'
-            }
-        }
-        test {
-            java {
-                srcDir 'test/java'
-            }
-            resources {
-                srcDir 'test/resources'
-            }
-        }
-    }
-
-    repositories {
-        maven { url 'http://repo.maven.apache.org/maven2' }
-    }
-
-    test {
-        testLogging {
-            exceptionFormat "full"
-        }
-        reports.html.enabled = false
-    }
-}
-
-task archivePrototype(type: Zip, dependsOn: subprojects.jar) {
-    baseName = 'prototype'
-    from fileTree('prototype')
-
-    from (project('core').jar) {
-        into 'lib'
-    }
-
-    from (project('common').jar) {
-        into 'lib'
-    }
-
-    from (project('services').subprojects.jar) {
-        into 'lib'
-    }
-}
-
-task prototype(type: JavaExec, dependsOn: subprojects.classes) {
-    workingDir = 'prototype'
-    main = 'com.codingchili.core.Launcher'
-
-    if (project.hasProperty('exec')) {
-        args += exec
-    }
-
-    subprojects.each {
-        classpath += it.sourceSets.main.runtimeClasspath
-    }
-}
-
-task alljavadoc(type: Javadoc) {
-    source subprojects.collect { it.sourceSets.main.allJava }
-    classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath })
-    destinationDir = file("${buildDir}/docs/javadoc")
-}
-
-task archiveJavadoc(type: Zip, dependsOn: alljavadoc) {
-    baseName = 'javadocs'
-    from fileTree(file("${buildDir}/docs/javadoc"))
-}
-
-task testReport(type: TestReport, dependsOn: 'build') {
-    destinationDir = file("$buildDir/reports/allTests")
-    reportOn subprojects*.test
-}
-
-task archiveTestReport(type: Zip, dependsOn: testReport) {
-    baseName = 'testreport'
-    from fileTree(file("$buildDir/reports/allTests"))
+apply plugin: 'java'
+apply plugin: 'idea'
+
+project.version = "1.0.3-SNAPSHOT"
+project.group = 'com.codingchili'
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'idea'
+
+    version = rootProject.version
+    group = rootProject.group
+
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
+
+    sourceSets {
+        main {
+            java {
+                srcDir 'main/java'
+            }
+            resources {
+                srcDir 'main/resources'
+            }
+        }
+        test {
+            java {
+                srcDir 'test/java'
+            }
+            resources {
+                srcDir 'test/resources'
+            }
+        }
+    }
+
+    repositories {
+        maven { url 'http://repo.maven.apache.org/maven2' }
+    }
+
+    test {
+        testLogging {
+            exceptionFormat "full"
+        }
+        reports.html.enabled = false
+    }
+}
+
+task archivePrototype(type: Zip, dependsOn: subprojects.jar) {
+    baseName = 'prototype'
+    from fileTree('prototype')
+
+    from (project('core').jar) {
+        into 'lib'
+    }
+
+    from (project('common').jar) {
+        into 'lib'
+    }
+
+    from (project('services').subprojects.jar) {
+        into 'lib'
+    }
+}
+
+task prototype(type: JavaExec, dependsOn: subprojects.classes) {
+    workingDir = 'prototype'
+    main = 'com.codingchili.core.Launcher'
+
+    if (project.hasProperty('exec')) {
+        args += exec
+    }
+
+    subprojects.each {
+        classpath += it.sourceSets.main.runtimeClasspath
+    }
+}
+
+task alljavadoc(type: Javadoc) {
+    source subprojects.collect { it.sourceSets.main.allJava }
+    classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath })
+    destinationDir = file("${buildDir}/docs/javadoc")
+}
+
+task archiveJavadoc(type: Zip, dependsOn: alljavadoc) {
+    baseName = 'javadocs'
+    from fileTree(file("${buildDir}/docs/javadoc"))
+}
+
+task testReport(type: TestReport, dependsOn: 'build') {
+    destinationDir = file("$buildDir/reports/allTests")
+    reportOn subprojects*.test
+}
+
+task archiveTestReport(type: Zip, dependsOn: testReport) {
+    baseName = 'testreport'
+    from fileTree(file("$buildDir/reports/allTests"))
 }
diff --git a/prototype/conf/realm/Angel Oak.json b/prototype/conf/realm/Angel Oak.json
@@ -1,29 +1,29 @@
-{
-  "node" : "Angel Oak.realm.node",
-  "attributes" : {
-    "drop" : 1.0,
-    "classes" : [ "Paladin" ],
-    "lifetime" : "weekly",
-    "description" : "Stable realm, PvP Aggressive.",
-    "leveling" : 1.0,
-    "type" : "PvP"
-  },
-  "authentication" : {
-    "key" : "0mJDLjEXBbY/dCBD3dQ9Oi1F2i6auysmrlrnvB4+f+ONyd6QPs+aNe6OGdMw8X0SAL7Dgep9J08aasbnnaFq8A==",
-    "expiry" : 1493020641,
-    "domain" : "Angel Oak.realm.node"
-  },
-  "resources" : "patching.node",
-  "version" : 1.0,
-  "size" : 5000,
-  "players" : 0,
-  "name" : "Angel Oak",
-  "remote" : "Angel Oak.realm.node",
-  "secret" : "c4MhHduyhJJ1J/4JszSMCLtrFgvBAGF5bZsqIeTHTa+Rs0zqVJRnDBnWQera8MyvFRGia89FFxWSbnPci+7Iiw==",
-  "global" : "0hhJXzrfdRU9/zhk2d20YwvcUZz6lXCRx5Or8I5hBOY5eQtQ1+73aKP3gwzoCtYwv4lZG9EfpuIfMaYKzK376Q==",
-  "logging" : {
-    "key" : "rmMgjBPfu2KhlQ6lK9WjUAIqlTwOL0nyJKjS3w7RiIn9K/YNZisiJGEE7Yj7L3iJiLArSe0juxH0MleNM5aAmw==",
-    "expiry" : 1493020640,
-    "domain" : "Angel Oak.realm.node"
-  }
+{
+  "node" : "Angel Oak.realm.node",
+  "attributes" : {
+    "drop" : 1.0,
+    "classes" : [ "Paladin" ],
+    "lifetime" : "weekly",
+    "description" : "Stable realm, PvP Aggressive.",
+    "leveling" : 1.0,
+    "type" : "PvP"
+  },
+  "authentication" : {
+    "key" : "jUG1Mve6G32ZWjflyD11LwYMIs4xYVxYUmYfiUCam+s0YdK4+PX/xC9+uvvdFCY3QeVzktYnghVWmCAKCOC1AQ==",
+    "expiry" : 1497889120,
+    "domain" : "Angel Oak.realm.node"
+  },
+  "resources" : "patching.node",
+  "version" : 1.0,
+  "size" : 5000,
+  "players" : 0,
+  "name" : "Angel Oak",
+  "remote" : "Angel Oak.realm.node",
+  "secret" : "Y9fgg91QAq8MwdEG4SA5d4jnWLbPv9oBAAnO1I5DVtQV6/GuhJ0EZBUPhkH+UYdU/hssf08l6QaVyMlEz2I35Q==",
+  "global" : "XLHtKfhr000jy0fM4p17gqFBSppSedze83g3H1PGrHKlPDEMhf3s7YJWzptFZiB69AdubAnWCZbvg6rAQT5dEA==",
+  "logging" : {
+    "key" : "E4nezhaDsmtMdsBLrur7ecv5fjS36EgTNjghSDSbrcX2jg+2Ny6CdngSoF7fnd/VMjTz8eXjcoCra9ztjJSSkw==",
+    "expiry" : 1497889119,
+    "domain" : "Angel Oak.realm.node"
+  }
 }
diff --git a/prototype/conf/service/authserver.json b/prototype/conf/service/authserver.json
@@ -1,11 +1,11 @@
-{
-  "node" : "authentication.node",
-  "storage" : "com.codingchili.core.storage.IndexedMap",
-  "clientSecret" : "uAMS21wrYfPhAHl/FbekLXUXoMXGAo1FEhXOhTjfDCf/zVxGkW1kASPF/LURxxp8g565q/MXg5gSR4AOnGPDiw==",
-  "global" : "0hhJXzrfdRU9/zhk2d20YwvcUZz6lXCRx5Or8I5hBOY5eQtQ1+73aKP3gwzoCtYwv4lZG9EfpuIfMaYKzK376Q==",
-  "logging" : {
-    "key" : "GsN3ybXwig4p3IGiJ+QJhYAU84f62CsrcEbrpHi+vJsj3T2GAdfyKHXg4W8Mxc/aDiUscZNUfM3E2DJGO6UVNw==",
-    "expiry" : 1493020641,
-    "domain" : "authentication.node"
-  }
+{
+  "node" : "authentication.node",
+  "storage" : "com.codingchili.core.storage.IndexedMap",
+  "clientSecret" : "QeqxlkzQZ58qhb4zFqu24VKekcJc/OWNlytUCdDVQoy0u0L4KkHexcmJ3smf25EzK9qMcpIlsYViAh9xSHc1rw==",
+  "global" : "XLHtKfhr000jy0fM4p17gqFBSppSedze83g3H1PGrHKlPDEMhf3s7YJWzptFZiB69AdubAnWCZbvg6rAQT5dEA==",
+  "logging" : {
+    "key" : "Y06bFIeGQmbDWpAdQt+TsC1NWeBuGvTzR891Qai1FNJ3hKGvbYSo7zfkshLV6SbnhSI9u+UTbzNzvjGJl8mrvQ==",
+    "expiry" : 1497889120,
+    "domain" : "authentication.node"
+  }
 }
diff --git a/prototype/conf/service/logserver.json b/prototype/conf/service/logserver.json
@@ -1,28 +1,28 @@
-{
-  "node" : "logging.node",
-  "elastic" : {
-    "remote" : "localhost",
-    "index" : "chili.core.logging.v101",
-    "port" : 9200,
-    "template" : {
-      "mappings" : {
-        "the_def_index" : {
-          "properties" : {
-            "time" : {
-              "type" : "date"
-            }
-          }
-        }
-      }
-    },
-    "enabled" : false
-  },
-  "secret" : "RLee1EAXKZGqQZHRNzBNQP1FKV4rnJmMEyKHWT/8+rErKu+1jgO5rYXUaTJaDTQ1n12tyxT5WYKGo15KtmNCoA==",
-  "console" : false,
-  "global" : "0hhJXzrfdRU9/zhk2d20YwvcUZz6lXCRx5Or8I5hBOY5eQtQ1+73aKP3gwzoCtYwv4lZG9EfpuIfMaYKzK376Q==",
-  "logging" : {
-    "key" : "aIGGqhTPBWWRQ5wXsG51Gf/1sm0JoiuLYX3G72CTVrhQ/wUvdsuiVMQQXPj/dRIBTYG0X+oy09NwyUvEJqblYw==",
-    "expiry" : 1493020641,
-    "domain" : "logging.node"
-  }
+{
+  "node" : "logging.node",
+  "elastic" : {
+    "remote" : "localhost",
+    "index" : "chili.core.logging.v101",
+    "port" : 9200,
+    "template" : {
+      "mappings" : {
+        "the_def_index" : {
+          "properties" : {
+            "time" : {
+              "type" : "date"
+            }
+          }
+        }
+      }
+    },
+    "enabled" : false
+  },
+  "secret" : "unEluLPRoo5GzU6dR/5V3lZS0jlIpHZOUL3dnS0bc9trHKkL5o07WEpaGeR+N4bRn+Xb1XNfHCef94GRPKDEug==",
+  "console" : false,
+  "global" : "XLHtKfhr000jy0fM4p17gqFBSppSedze83g3H1PGrHKlPDEMhf3s7YJWzptFZiB69AdubAnWCZbvg6rAQT5dEA==",
+  "logging" : {
+    "key" : "OJ4iEY0k8SB0JPKO648FDVfPc2NUhS1Xp2GKe1agcuygKzXKqUxoY0JqXXXobiqgItYI1FXynh8XCV1EZuZ2BQ==",
+    "expiry" : 1497889120,
+    "domain" : "logging.node"
+  }
 }