aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------deps/com.juick6
m---------deps/com.juick.server6
-rw-r--r--juick-rss/build.gradle22
-rw-r--r--juick-rss/src/main/java/com/juick/rss/Main.java (renamed from src/main/java/com/juick/rss/Main.java)0
-rw-r--r--juick-rss/src/main/java/com/juick/rss/Utils.java (renamed from src/main/java/com/juick/rss/Utils.java)0
-rw-r--r--juick-rss/src/main/webapp/WEB-INF/juick.conf.example (renamed from src/main/webapp/WEB-INF/juick.conf.example)0
-rw-r--r--juick-rss/src/main/webapp/WEB-INF/web.xml (renamed from src/main/webapp/WEB-INF/web.xml)0
7 files changed, 22 insertions, 12 deletions
diff --git a/deps/com.juick b/deps/com.juick
deleted file mode 160000
-Subproject 39ec74abe77cdab5aa8f50c2524e6f71c2dbbd0
diff --git a/deps/com.juick.server b/deps/com.juick.server
deleted file mode 160000
-Subproject 797942249b0d5e38285e806bc0e73e755e6ffed
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
new file mode 100644
index 00000000..19a128e3
--- /dev/null
+++ b/juick-rss/build.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'org.akhikhl.gretty'
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile project(':juick-core')
+ providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+ testCompile 'junit:junit:4.12'
+ providedRuntime 'mysql:mysql-connector-java:5.1.39'
+}
+
+compileJava.options.encoding = 'UTF-8'
+
+gretty {
+ httpPort = 8080
+ contextPath = '/'
+ servletContainer = 'tomcat8'
+}
diff --git a/src/main/java/com/juick/rss/Main.java b/juick-rss/src/main/java/com/juick/rss/Main.java
index 32e7ebae..32e7ebae 100644
--- a/src/main/java/com/juick/rss/Main.java
+++ b/juick-rss/src/main/java/com/juick/rss/Main.java
diff --git a/src/main/java/com/juick/rss/Utils.java b/juick-rss/src/main/java/com/juick/rss/Utils.java
index 036a5a6b..036a5a6b 100644
--- a/src/main/java/com/juick/rss/Utils.java
+++ b/juick-rss/src/main/java/com/juick/rss/Utils.java
diff --git a/src/main/webapp/WEB-INF/juick.conf.example b/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
index 2cb6f4f7..2cb6f4f7 100644
--- a/src/main/webapp/WEB-INF/juick.conf.example
+++ b/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
diff --git a/src/main/webapp/WEB-INF/web.xml b/juick-rss/src/main/webapp/WEB-INF/web.xml
index a4264bb0..a4264bb0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/juick-rss/src/main/webapp/WEB-INF/web.xml