aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle27
-rw-r--r--src/main/java/com/juick/api/Main.java6
2 files changed, 13 insertions, 20 deletions
diff --git a/build.gradle b/build.gradle
index d9317928..84617e95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,21 +4,20 @@ subprojects {
mavenCentral()
}
}
-
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
- classpath 'com.bmuschko:gradle-tomcat-plugin:2.2.+'
+ classpath 'org.akhikhl.gretty:gretty:+'
classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.7'
}
}
apply plugin: 'java'
apply plugin: 'war'
-apply plugin: 'com.bmuschko.tomcat'
+apply plugin: 'org.akhikhl.gretty'
apply plugin: 'com.github.tkruse.groovysh'
repositories {
@@ -35,40 +34,34 @@ project(':deps:com.juick.server') {
compile core
}
}
-
project(':deps:com.juick.xmpp') {
dependencies {
compile core
}
}
-
project(':deps:com.juick.json') {
dependencies {
compile core
}
}
-
+configurations.all {
+ exclude group: "commons-logging", module: "commons-logging"
+}
dependencies {
compile core
compile server
compile xmpp
compile json
compile "org.apache.commons:commons-lang3:3.4"
- compile 'com.github.pengrad:java-telegram-bot-api:2.0.1'
- compile 'com.neovisionaries:nv-websocket-client:1.27'
+ compile "org.springframework:spring-jdbc:4.2.6.RELEASE"
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
- def tomcatVersion = '7.0.+'
- tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
- "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
- "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
- testCompile 'junit:junit:4.12'
- runtime 'mysql:mysql-connector-java:5.1.37'
+ compile 'javax.inject:javax.inject:1'
+ runtime 'mysql:mysql-connector-java:5.1.39'
testRuntime 'com.h2database:h2:1.4.190'
}
-
compileJava.options.encoding = 'UTF-8'
-
-tomcat {
+gretty {
httpPort = 8080
contextPath = '/'
+ servletContainer = 'tomcat8'
}
diff --git a/src/main/java/com/juick/api/Main.java b/src/main/java/com/juick/api/Main.java
index 6adef22a..9b327e83 100644
--- a/src/main/java/com/juick/api/Main.java
+++ b/src/main/java/com/juick/api/Main.java
@@ -70,11 +70,11 @@ public class Main extends HttpServlet implements Stream.StreamListener {
public void init() throws ServletException {
super.init();
try {
- LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
+ LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("/WEB-INF/logging.properties"));
Properties conf = new Properties();
- conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+ conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName(conf.getProperty("datasource_driver"));
+ dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
dataSource.setUrl(conf.getProperty("datasource_url"));
jdbc = new JdbcTemplate(dataSource);
messages = new Messages(jdbc);