erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Moved to Log4J 2.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-05-19 09:43:16 -07:00
parent 32f0585a3c
commit 30c29f1a53
13 changed files with 149 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -20,7 +20,7 @@
/gen /gen
/gradle.properties /gradle.properties
/local.properties /local.properties
/log4j.properties /log4j2.xml
/logs /logs
/mobibot.properties /mobibot.properties
/out /out

83
.idea/modules/mobibot.iml generated
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.1-beta+020" type="JAVA_MODULE" version="4"> <module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.1-beta+022" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../../build/classes/main" /> <output url="file://$MODULE_DIR$/../../build/classes/main" />
<output-test url="file://$MODULE_DIR$/../../build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
@ -17,41 +17,28 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.logging.log4j:log4j-api:2.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.logging.log4j:log4j-core:2.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:1.5.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-net:commons-net:3.6" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: commons-net:commons-net:3.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-cli:commons-cli:1.4" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.rometools:rome:1.7.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: com.rometools:rome:1.7.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-log4j12:1.7.25" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.8.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.json:json:20160810" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.json:json:20170516" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.ostermiller:utils:1.07.00" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.0.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.rometools:rome-utils:1.7.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.rometools:rome-utils:1.7.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jdom:jdom2:2.0.6" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.24" level="project" />
<orderEntry type="module-library" scope="PROVIDED"> <orderEntry type="module-library" scope="PROVIDED">
<library name="Gradle: owm-japis-2.5.0.5"> <library name="Gradle: owm-japis-2.5.0.5">
<CLASSES> <CLASSES>
@ -61,24 +48,26 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" scope="RUNTIME" name="Gradle: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.apache.logging.log4j:log4j-api:2.8.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.apache.logging.log4j:log4j-core:2.8.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: pircbot:pircbot:1.5.0" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: commons-net:commons-net:3.6" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: commons-net:commons-net:3.6" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: commons-cli:commons-cli:1.4" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.rometools:rome:1.7.1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: com.rometools:rome:1.7.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.slf4j:slf4j-log4j12:1.7.25" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.8.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.json:json:20160810" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.json:json:20170516" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.ostermiller:utils:1.07.00" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.rometools:rome-utils:1.7.1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.rometools:rome-utils:1.7.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jdom:jdom2:2.0.6" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.slf4j:slf4j-api:1.7.24" level="project" />
<orderEntry type="module-library" scope="RUNTIME"> <orderEntry type="module-library" scope="RUNTIME">
<library name="Gradle: owm-japis-2.5.0.5"> <library name="Gradle: owm-japis-2.5.0.5">
<CLASSES> <CLASSES>
@ -88,24 +77,26 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" scope="TEST" name="Gradle: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.apache.logging.log4j:log4j-api:2.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.apache.logging.log4j:log4j-core:2.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: pircbot:pircbot:1.5.0" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: commons-net:commons-net:3.6" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: commons-net:commons-net:3.6" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: commons-cli:commons-cli:1.4" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jsoup:jsoup:1.10.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.rometools:rome:1.7.1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.rometools:rome:1.7.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.slf4j:slf4j-log4j12:1.7.25" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.json:json:20160810" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.json:json:20170516" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.ostermiller:utils:1.07.00" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.twitter4j:twitter4j-core:4.0.6" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.rometools:rome-utils:1.7.1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: net.thauvin.erik:pinboard-poster:0.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.13.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.rometools:rome-utils:1.7.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jdom:jdom2:2.0.6" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.slf4j:slf4j-api:1.7.24" level="project" />
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library name="Gradle: owm-japis-2.5.0.5"> <library name="Gradle: owm-japis-2.5.0.5">
<CLASSES> <CLASSES>

2
README.md
View file

@ -14,7 +14,7 @@ Some very basic instructions:
cd deploy cd deploy
{ configure the properties } { configure the properties }
vi *.properties vi *.properties *.xml
{ help } { help }
java -jar mobibot.jar -h java -jar mobibot.jar -h

25
build.gradle
View file

@ -49,29 +49,28 @@ repositories {
} }
dependencies { dependencies {
compile 'log4j:log4j:1.2.17@jar'
compile 'pircbot:pircbot:1.5.0' compile 'pircbot:pircbot:1.5.0'
compile 'org.apache.logging.log4j:log4j-api:2.8.2'
compile 'org.apache.logging.log4j:log4j-core:2.8.2'
//compile 'commons-codec:commons-codec:1.10'
compile 'commons-logging:commons-logging:1.2'
compile 'commons-net:commons-net:3.6'
compile 'commons-cli:commons-cli:1.4' compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
compile 'com.squareup.okhttp3:okhttp:3.8.0' compile 'com.squareup.okhttp3:okhttp:3.8.0'
compile 'oro:oro:2.0.8'
compile 'org.jsoup:jsoup:1.10.2'
compile 'com.rometools:rome:1.7.3' compile 'com.rometools:rome:1.7.3'
compile 'org.slf4j:slf4j-log4j12:1.7.25' compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2'
compile 'org.json:json:20170516' compile 'org.json:json:20170516'
compile 'org.ostermiller:utils:1.07.00' compile 'org.ostermiller:utils:1.07.00'
compile 'org.jsoup:jsoup:1.10.2'
compile 'net.objecthunter:exp4j:0.4.8' compile 'net.objecthunter:exp4j:0.4.8'
compile 'org.twitter4j:twitter4j-core:4.0.6' compile 'org.twitter4j:twitter4j-core:4.0.6'
compile 'net.thauvin.erik:pinboard-poster:0.9.1' compile 'net.thauvin.erik:pinboard-poster:0.9.1'
// https://bitbucket.org/akapribot/owm-japis
compile files('lib/owm-japis-2.5.0.5.jar') compile files('lib/owm-japis-2.5.0.5.jar')
compileOnly semverJar compileOnly semverJar
@ -113,9 +112,7 @@ task wrapper(type: Wrapper) {
} }
task copyToDeploy(type: Copy) { task copyToDeploy(type: Copy) {
from('properties') { from('properties')
include '*.properties'
}
from jar from jar
into deployDir into deployDir
} }

15
kobalt/Build.kt.iml
View file

@ -10,13 +10,22 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.83"> <library name="Kobalt: kobalt-versioneye-0.4.5.jar">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/cache/net/thauvin/erik/kobalt-versioneye/0.4.5/kobalt-versioneye-0.4.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.86">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.86/kobalt/wrapper/kobalt-1.0.86.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83-sources.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.86/kobalt/wrapper/kobalt-1.0.86-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>

23
kobalt/src/Build.kt
View file

@ -15,6 +15,7 @@ import java.util.*
val bs = buildScript { val bs = buildScript {
repos(localMaven()) repos(localMaven())
plugins("net.thauvin.erik:kobalt-versioneye:")
} }
val mainClassName = "net.thauvin.erik.mobibot.Mobibot" val mainClassName = "net.thauvin.erik.mobibot.Mobibot"
@ -52,29 +53,27 @@ val p = project {
val lib = "lib" val lib = "lib"
dependencies { dependencies {
compile("log4j:log4j:jar:1.2.17")
compile("pircbot:pircbot:1.5.0") compile("pircbot:pircbot:1.5.0")
//compile("commons-codec:commons-codec:1.10") compile("org.apache.logging.log4j:log4j-api:2.8.2")
compile("commons-logging:commons-logging:1.2") compile("org.apache.logging.log4j:log4j-core:2.8.2")
compile("commons-net:commons-net:3.6")
compile("commons-cli:commons-cli:1.4") compile("commons-cli:commons-cli:1.4")
compile("commons-net:commons-net:3.6")
compile("com.squareup.okhttp3:okhttp:3.8.0") compile("com.squareup.okhttp3:okhttp:3.8.0")
compile("oro:oro:2.0.8") compile("com.rometools:rome:1.7.3", "org.apache.logging.log4j:log4j-slf4j-impl:jar:2.8.2")
compile("org.jsoup:jsoup:1.10.2")
compile("com.rometools:rome:1.7.3")
compile("org.slf4j:slf4j-log4j12:1.7.25")
compile("org.json:json:20170516") compile("org.json:json:20170516")
compile("org.ostermiller:utils:1.07.00") compile("org.ostermiller:utils:1.07.00")
compile("org.jsoup:jsoup:1.10.2")
compile("net.objecthunter:exp4j:0.4.8") compile("net.objecthunter:exp4j:0.4.8")
compile("org.twitter4j:twitter4j-core:4.0.6") compile("org.twitter4j:twitter4j-core:4.0.6")
compile("net.thauvin.erik:pinboard-poster:0.9.1") compile("net.thauvin.erik:pinboard-poster:0.9.1")
// https://bitbucket.org/akapribot/owm-japis/
compile(file("lib/owm-japis-2.5.0.5.jar")) compile(file("lib/owm-japis-2.5.0.5.jar"))
apt(processorJar) apt(processorJar)
@ -98,7 +97,6 @@ val p = project {
attributes("Main-Class", mainClassName) attributes("Main-Class", mainClassName)
attributes("Class-Path", attributes("Class-Path",
collect(compileDependencies) collect(compileDependencies)
.filter { !it.file.name.startsWith("junit") }
.map { it.file.name } .map { it.file.name }
.joinToString(" ./$lib/", prefix = ". ./$lib/")) .joinToString(" ./$lib/", prefix = ". ./$lib/"))
} }
@ -113,9 +111,8 @@ val p = project {
install { install {
target = deploy target = deploy
include(from("kobaltBuild/libs"), to(target), glob("**/*")) include(from("kobaltBuild/libs"), to(target), glob("**/*"))
include(from("properties"), to(target), glob("**/*.properties")) include(from("properties"), to(target), glob("**/*"))
collect(compileDependencies) collect(compileDependencies)
.filter { !it.file.name.startsWith("junit") }
.forEach { .forEach {
copy(from(it.file.absolutePath), to("$target/$lib")) copy(from(it.file.absolutePath), to("$target/$lib"))
} }

111
mobibot.ipr
View file

@ -339,22 +339,22 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.spullara.mustache.java/compiler/0.9.4/599674a480f9940ff5e25b375c6f59d14d8a4bfa/compiler-0.9.4-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.spullara.mustache.java/compiler/0.9.4/599674a480f9940ff5e25b375c6f59d14d8a4bfa/compiler-0.9.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: com.rometools:rome-utils:1.7.1"> <library name="Gradle: com.rometools:rome-utils:1.7.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.7.1/36592957a19bbfdb6f1182ea3e6036bccaec0bdc/rome-utils-1.7.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.7.3/53e57b41a8f3440ca808bd5f246cb70ba6dcc67a/rome-utils-1.7.3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.7.1/3fa41b350dc73b3338322471294a83b5bbb1bbae/rome-utils-1.7.1-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.7.3/451e50a658f7ca5d59faa68715428093397751f5/rome-utils-1.7.3-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: com.rometools:rome:1.7.1"> <library name="Gradle: com.rometools:rome:1.7.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.7.1/b15f1e5277ffa19077672ad7f889a636e661d6ee/rome-1.7.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.7.3/18d04e4c24025077bacc5e4f2ca0fd48587f56e8/rome-1.7.3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.7.1/2bab37f921df082d245d440f96dc63a69cb5f67/rome-1.7.1-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.7.3/d30dbef2c5e08f388157dc4cf7d9c55faa37e929/rome-1.7.3-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: com.squareup.okhttp3:okhttp:3.8.0"> <library name="Gradle: com.squareup.okhttp3:okhttp:3.8.0">
@ -384,33 +384,6 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/40dfd9fdef125e19136135e68d54af6d9b0cfbb8/commons-cli-1.4-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/40dfd9fdef125e19136135e68d54af6d9b0cfbb8/commons-cli-1.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: commons-codec:commons-codec:1.10">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-httpclient:commons-httpclient:3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-httpclient/commons-httpclient/3.1/964cd74171f427720480efdec40a7c7f6e58426a/commons-httpclient-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-httpclient/commons-httpclient/3.1/c6d6ea83d0cf16d3ed9c1b7e600fa0f60b9d3159/commons-httpclient-3.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-logging:commons-logging:1.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/ecf26c7507d67782a3bbd148d170b31dfad001aa/commons-logging-1.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-net:commons-net:3.6"> <library name="Gradle: commons-net:commons-net:3.6">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar!/" />
@ -420,15 +393,6 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/961dc27eabbe71bf32478baffe0e1be915ce7689/commons-net-3.6-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/961dc27eabbe71bf32478baffe0e1be915ce7689/commons-net-3.6-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: log4j:log4j:1.2.17">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/5af35056b4d257e4b64b9e8069c0746e8b08629f/log4j-1.2.17.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/677abe279b68c5e7490d6d50c6951376238d7d3e/log4j-1.2.17-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.objecthunter:exp4j:0.4.8"> <library name="Gradle: net.objecthunter:exp4j:0.4.8">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar!/" />
@ -438,13 +402,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/8d86f148ff1f0d5b624eae9bb0882198ab5cd07/exp4j-0.4.8-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/8d86f148ff1f0d5b624eae9bb0882198ab5cd07/exp4j-0.4.8-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: net.thauvin.erik:pinboard-poster:0.9.0"> <library name="Gradle: net.thauvin.erik:pinboard-poster:0.9.1">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/0.9.0/pinboard-poster-0.9.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/0.9.1/pinboard-poster-0.9.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/0.9.0/pinboard-poster-0.9.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/0.9.1/pinboard-poster-0.9.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: net.thauvin.erik:semver:1.0.0"> <library name="Gradle: net.thauvin.erik:semver:1.0.0">
@ -456,6 +420,33 @@
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.0.0/semver-1.0.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.0.0/semver-1.0.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.apache.logging.log4j:log4j-api:2.8.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.2/e590eeb783348ce8ddef205b82127f9084d82bf3/log4j-api-2.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.2/459702eacc545a5478627fe879cec6e004c00f3a/log4j-api-2.8.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.logging.log4j:log4j-core:2.8.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.2/979fc0cf8460302e4ffbfe38c1b66a99450b0bb7/log4j-core-2.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.2/4693b08b8d9abe152417b9564bb7a68d82630180/log4j-core-2.8.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.8.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.8.2/36bc2a99b86be26ccdc51fe288458dc712d280c1/log4j-slf4j-impl-2.8.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.8.2/c5f494286f220ba330c6eabccf10740458ef1fab/log4j-slf4j-impl-2.8.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.jdom:jdom2:2.0.6"> <library name="Gradle: org.jdom:jdom2:2.0.6">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar!/" />
@ -483,13 +474,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/5991ca87ef1fb5544943d9abc5a9a37583fabe03/annotations-13.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/5991ca87ef1fb5544943d9abc5a9a37583fabe03/annotations-13.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.json:json:20160810"> <library name="Gradle: org.json:json:20170516">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20160810/aca5eb39e2a12fddd6c472b240afe9ebea3a6733/json-20160810.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20170516/949abe1460757b8dc9902c562f83e49675444572/json-20170516.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20160810/92f4b89bc0bb4c7c3f7b52724568a901b7e0195b/json-20160810-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20170516/6d919271d0ac012fb5706abd62fd3aff0f78ed95/json-20170516-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.jsoup:jsoup:1.10.2"> <library name="Gradle: org.jsoup:jsoup:1.10.2">
@ -510,22 +501,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ostermiller/utils/1.07.00/586774ee4b8409b6835621bae2186d9b54d1c36a/utils-1.07.00-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ostermiller/utils/1.07.00/586774ee4b8409b6835621bae2186d9b54d1c36a/utils-1.07.00-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.slf4j:slf4j-api:1.7.25"> <library name="Gradle: org.slf4j:slf4j-api:1.7.24">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.24/3f6b4bd4f8dbe8d4bea06d107a3826469b85c3e9/slf4j-api-1.7.24.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/962153db4a9ea71b79d047dfd1b2a0d80d8f4739/slf4j-api-1.7.25-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.24/9f1cecd7c757ad5dde29453d43315228bb0a7c7e/slf4j-api-1.7.24-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.slf4j:slf4j-log4j12:1.7.25">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-log4j12/1.7.25/110cefe2df103412849d72ef7a67e4e91e4266b4/slf4j-log4j12-1.7.25.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-log4j12/1.7.25/d6f907c4254a49f40fa46005b65bc97261ad9e46/slf4j-log4j12-1.7.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: org.twitter4j:twitter4j-core:4.0.6"> <library name="Gradle: org.twitter4j:twitter4j-core:4.0.6">
@ -537,15 +519,6 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.6/5a3a910793c3510a3e25cea3c51672bb88124527/twitter4j-core-4.0.6-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.6/5a3a910793c3510a3e25cea3c51672bb88124527/twitter4j-core-4.0.6-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: oro:oro:2.0.8">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/oro/oro/2.0.8/5592374f834645c4ae250f4c9fbb314c9369d698/oro-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/oro/oro/2.0.8/3598e790ecd76ff7eb249853d4d00822ae1a5e71/oro-2.0.8-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: pircbot:pircbot:1.5.0"> <library name="Gradle: pircbot:pircbot:1.5.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar!/" />

15
properties/log4j.properties
View file

@ -1,15 +0,0 @@
log4j.rootLogger=FATAL, stderr
# Standard Error Console Appender
log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
#log4j.appender.stderr.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
log4j.appender.stderr.layout.ConversionPattern=%d [%p] %c %x %m%n
log4j.appender.stderr.target=System.err
# Print only messages of priority FATAL or above in the package org.apache.commons.httpclient
log4j.logger.org.apache.commons.httpclient=FATAL
log4j.logger.httpclient.wire=FATAL
# Print only messages of priority FATAL or above in the package net.thauvin.erik.mobibot
log4j.category.net.thauvin.erik.mobibot=FATAL

16
properties/log4j2.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Appenders>
<Console name="stderr" target="SYSTEM_ERR">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>
<Logger name="net.thauvin.erik.mobibot" level="warn" additivity="false">
<AppenderRef ref="stderr"/>
</Logger>
<Root level="error">
<AppenderRef ref="stderr"/>
</Root>
</Loggers>
</Configuration>

6
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -18,12 +18,12 @@ public final class ReleaseInfo {
public final static String PROJECT = "mobibot"; public final static String PROJECT = "mobibot";
public final static LocalDateTime BUILDDATE = public final static LocalDateTime BUILDDATE =
LocalDateTime.ofInstant(Instant.ofEpochMilli(1495067438992L), ZoneId.systemDefault()); LocalDateTime.ofInstant(Instant.ofEpochMilli(1495210914271L), ZoneId.systemDefault());
public final static int MAJOR = 0; public final static int MAJOR = 0;
public final static int MINOR = 7; public final static int MINOR = 7;
public final static int PATCH = 1; public final static int PATCH = 2;
public final static String PRERELEASE = "beta"; public final static String PRERELEASE = "beta";
public final static String BUILDMETA = "021"; public final static String BUILDMETA = "022";
/** /**
* The full version string. * The full version string.

17
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -35,8 +35,10 @@ import com.rometools.rome.io.FeedException;
import net.thauvin.erik.mobibot.modules.*; import net.thauvin.erik.mobibot.modules.*;
import net.thauvin.erik.semver.Version; import net.thauvin.erik.semver.Version;
import org.apache.commons.cli.*; import org.apache.commons.cli.*;
import org.apache.commons.logging.impl.Log4JLogger; import org.apache.logging.log4j.Level;
import org.apache.log4j.Level; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.jibble.pircbot.PircBot; import org.jibble.pircbot.PircBot;
import org.jibble.pircbot.User; import org.jibble.pircbot.User;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
@ -150,7 +152,7 @@ public class Mobibot extends PircBot {
private final String ircServer; private final String ircServer;
// The logger. // The logger.
private final Log4JLogger logger = new Log4JLogger(Mobibot.class.getPackage().getName()); private final Logger logger = LogManager.getLogger(Mobibot.class);
// The logger default level. // The logger default level.
private final Level loggerLevel; private final Level loggerLevel;
@ -208,7 +210,7 @@ public class Mobibot extends PircBot {
this.logsDir = logsDir; this.logsDir = logsDir;
// Set the logger level // Set the logger level
loggerLevel = logger.getLogger().getLevel(); loggerLevel = logger.getLevel();
// Load the current entries, if any. // Load the current entries, if any.
try { try {
@ -527,7 +529,7 @@ public class Mobibot extends PircBot {
* *
* @return The bot's logger. * @return The bot's logger.
*/ */
public final Log4JLogger getLogger() { public final Logger getLogger() {
return logger; return logger;
} }
@ -1399,9 +1401,10 @@ public class Mobibot extends PircBot {
versionResponse(sender, true); versionResponse(sender, true);
} else if (cmd.equals(Commands.DEBUG_CMD) && isOp(sender)) { } else if (cmd.equals(Commands.DEBUG_CMD) && isOp(sender)) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.getLogger().setLevel(loggerLevel); Configurator.setLevel(logger.getName(), loggerLevel);
} else { } else {
logger.getLogger().setLevel(Level.DEBUG); Configurator.setLevel(logger.getName(), Level.DEBUG);
} }
send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true); send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true);

6
src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
View file

@ -31,7 +31,7 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import org.apache.commons.logging.impl.Log4JLogger; import org.apache.logging.log4j.Logger;
import java.io.*; import java.io.*;
import java.time.Clock; import java.time.Clock;
@ -87,7 +87,7 @@ final class TellMessagesMgr {
* @return The {@link net.thauvin.erik.mobibot.TellMessage} array. * @return The {@link net.thauvin.erik.mobibot.TellMessage} array.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static List<TellMessage> load(final String file, final Log4JLogger logger) { public static List<TellMessage> load(final String file, final Logger logger) {
try { try {
try (ObjectInput input = new ObjectInputStream(new BufferedInputStream(new FileInputStream(file)))) { try (ObjectInput input = new ObjectInputStream(new BufferedInputStream(new FileInputStream(file)))) {
@ -115,7 +115,7 @@ final class TellMessagesMgr {
* @param messages The {@link net.thauvin.erik.mobibot.TellMessage} array. * @param messages The {@link net.thauvin.erik.mobibot.TellMessage} array.
* @param logger The logger. * @param logger The logger.
*/ */
public static void save(final String file, final List<TellMessage> messages, final Log4JLogger logger) { public static void save(final String file, final List<TellMessage> messages, final Logger logger) {
try { try {
try (ObjectOutput output = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) { try (ObjectOutput output = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) {

6
version.properties
View file

@ -1,8 +1,8 @@
#Mon, 17 Apr 2017 22:49:41 -0700 #Fri, 19 May 2017 09:20:42 -0700
#Mon Dec 07 01:31:00 PST 2015 #Mon Dec 07 01:31:00 PST 2015
version.project=mobibot version.project=mobibot
version.major=0 version.major=0
version.minor=7 version.minor=7
version.patch=1 version.patch=2
version.prerelease=beta version.prerelease=beta
version.buildmeta=021 version.buildmeta=022