aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle2
m---------deps/com.juick.server6
-rw-r--r--src/main/java/com/juick/http/www/TwitterAuth.java2
-rw-r--r--src/main/webapp/WEB-INF/web.xml8
4 files changed, 11 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle
index 76087986..cadcc22e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
classpath 'com.eriwen:gradle-css-plugin:1.11.1'
classpath 'com.eriwen:gradle-js-plugin:1.12.1'
classpath 'com.bmuschko:gradle-tomcat-plugin:2.2.+'
+ classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.7'
}
}
@@ -21,6 +22,7 @@ apply plugin: 'war'
apply plugin: 'css'
apply plugin: 'com.bmuschko.tomcat'
apply plugin: 'com.eriwen.gradle.js'
+apply plugin: 'com.github.tkruse.groovysh'
repositories {
diff --git a/deps/com.juick.server b/deps/com.juick.server
-Subproject 512d0b353f28e241937be3fa146617ba8ff97c9
+Subproject 4197b8b4bfb10ab222d8a6c35a44e9f44c8a322
diff --git a/src/main/java/com/juick/http/www/TwitterAuth.java b/src/main/java/com/juick/http/www/TwitterAuth.java
index b51cbf5e..d6abaa75 100644
--- a/src/main/java/com/juick/http/www/TwitterAuth.java
+++ b/src/main/java/com/juick/http/www/TwitterAuth.java
@@ -76,7 +76,7 @@ public class TwitterAuth {
response.setStatus(HttpServletResponse.SC_FOUND);
response.setHeader("Location", "http://juick.com/settings");
} else {
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ response.sendError(500);
}
}
}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index a7cb489a..72777b83 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,6 +16,14 @@
<servlet-name>default</servlet-name>
<url-pattern>/style.css</url-pattern>
</servlet-mapping>
+ <mime-mapping>
+ <extension>js</extension>
+ <mime-type>application/javascript;charset=UTF-8</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css;charset=UTF-8</mime-type>
+ </mime-mapping>
<session-config>
<session-timeout>
30