diff --git a/.bowerrc b/commafeed-client/.bowerrc similarity index 100% rename from .bowerrc rename to commafeed-client/.bowerrc diff --git a/commafeed-client/.gitignore b/commafeed-client/.gitignore new file mode 100644 index 00000000..0fb007ab --- /dev/null +++ b/commafeed-client/.gitignore @@ -0,0 +1,39 @@ +# config file +config.yml + +# build directory +target +target-ide + +# database files +database + +# log files +log + +# jetty sessions +sessions + +# node +node +node_modules + +# bower +src/main/app/lib + +# Eclipse files +.project +.classpath +.settings +.factorypath +.checkstyle + +# IntelliJ Idea files +.idea +*.iml + +# Sublime +*.sublime* + +# Macs +*.DS_Store diff --git a/.prettierrc b/commafeed-client/.prettierrc similarity index 100% rename from .prettierrc rename to commafeed-client/.prettierrc diff --git a/bower.json b/commafeed-client/bower.json similarity index 100% rename from bower.json rename to commafeed-client/bower.json diff --git a/gulp b/commafeed-client/gulp similarity index 100% rename from gulp rename to commafeed-client/gulp diff --git a/gulp.cmd b/commafeed-client/gulp.cmd similarity index 100% rename from gulp.cmd rename to commafeed-client/gulp.cmd diff --git a/gulpfile.js b/commafeed-client/gulpfile.js similarity index 100% rename from gulpfile.js rename to commafeed-client/gulpfile.js diff --git a/package.json b/commafeed-client/package.json similarity index 100% rename from package.json rename to commafeed-client/package.json diff --git a/commafeed-client/pom.xml b/commafeed-client/pom.xml new file mode 100644 index 00000000..c95d05e0 --- /dev/null +++ b/commafeed-client/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + + com.commafeed + commafeed + ${revision} + + commafeed-client + CommaFeed Client + + + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + + + install node and npm + + install-node-and-npm + + compile + + v6.11.4 + 3.10.6 + + + + npm install + + npm + + compile + + install + + + + bower install + + bower + + compile + + install + + + + gulp build + + gulp + + compile + + + + + + \ No newline at end of file diff --git a/src/main/app/api/index.html b/commafeed-client/src/main/app/api/index.html similarity index 100% rename from src/main/app/api/index.html rename to commafeed-client/src/main/app/api/index.html diff --git a/src/main/app/app-icon-114.png b/commafeed-client/src/main/app/app-icon-114.png similarity index 100% rename from src/main/app/app-icon-114.png rename to commafeed-client/src/main/app/app-icon-114.png diff --git a/src/main/app/app-icon-128.png b/commafeed-client/src/main/app/app-icon-128.png similarity index 100% rename from src/main/app/app-icon-128.png rename to commafeed-client/src/main/app/app-icon-128.png diff --git a/src/main/app/app-icon-144.png b/commafeed-client/src/main/app/app-icon-144.png similarity index 100% rename from src/main/app/app-icon-144.png rename to commafeed-client/src/main/app/app-icon-144.png diff --git a/src/main/app/app-icon-16.png b/commafeed-client/src/main/app/app-icon-16.png similarity index 100% rename from src/main/app/app-icon-16.png rename to commafeed-client/src/main/app/app-icon-16.png diff --git a/src/main/app/app-icon-192.png b/commafeed-client/src/main/app/app-icon-192.png similarity index 100% rename from src/main/app/app-icon-192.png rename to commafeed-client/src/main/app/app-icon-192.png diff --git a/src/main/app/app-icon-195.png b/commafeed-client/src/main/app/app-icon-195.png similarity index 100% rename from src/main/app/app-icon-195.png rename to commafeed-client/src/main/app/app-icon-195.png diff --git a/src/main/app/app-icon-256.png b/commafeed-client/src/main/app/app-icon-256.png similarity index 100% rename from src/main/app/app-icon-256.png rename to commafeed-client/src/main/app/app-icon-256.png diff --git a/src/main/app/app-icon-32.png b/commafeed-client/src/main/app/app-icon-32.png similarity index 100% rename from src/main/app/app-icon-32.png rename to commafeed-client/src/main/app/app-icon-32.png diff --git a/src/main/app/app-icon-512.png b/commafeed-client/src/main/app/app-icon-512.png similarity index 100% rename from src/main/app/app-icon-512.png rename to commafeed-client/src/main/app/app-icon-512.png diff --git a/src/main/app/app-icon-57.png b/commafeed-client/src/main/app/app-icon-57.png similarity index 100% rename from src/main/app/app-icon-57.png rename to commafeed-client/src/main/app/app-icon-57.png diff --git a/src/main/app/app-icon-64.png b/commafeed-client/src/main/app/app-icon-64.png similarity index 100% rename from src/main/app/app-icon-64.png rename to commafeed-client/src/main/app/app-icon-64.png diff --git a/src/main/app/app-icon-72.png b/commafeed-client/src/main/app/app-icon-72.png similarity index 100% rename from src/main/app/app-icon-72.png rename to commafeed-client/src/main/app/app-icon-72.png diff --git a/src/main/app/app-icon.svg b/commafeed-client/src/main/app/app-icon.svg similarity index 100% rename from src/main/app/app-icon.svg rename to commafeed-client/src/main/app/app-icon.svg diff --git a/src/main/app/favicon.ico b/commafeed-client/src/main/app/favicon.ico similarity index 100% rename from src/main/app/favicon.ico rename to commafeed-client/src/main/app/favicon.ico diff --git a/src/main/app/i18n/ar.js b/commafeed-client/src/main/app/i18n/ar.js similarity index 100% rename from src/main/app/i18n/ar.js rename to commafeed-client/src/main/app/i18n/ar.js diff --git a/src/main/app/i18n/ca.js b/commafeed-client/src/main/app/i18n/ca.js similarity index 100% rename from src/main/app/i18n/ca.js rename to commafeed-client/src/main/app/i18n/ca.js diff --git a/src/main/app/i18n/cs.js b/commafeed-client/src/main/app/i18n/cs.js similarity index 100% rename from src/main/app/i18n/cs.js rename to commafeed-client/src/main/app/i18n/cs.js diff --git a/src/main/app/i18n/cy.js b/commafeed-client/src/main/app/i18n/cy.js similarity index 100% rename from src/main/app/i18n/cy.js rename to commafeed-client/src/main/app/i18n/cy.js diff --git a/src/main/app/i18n/da.js b/commafeed-client/src/main/app/i18n/da.js similarity index 100% rename from src/main/app/i18n/da.js rename to commafeed-client/src/main/app/i18n/da.js diff --git a/src/main/app/i18n/de.js b/commafeed-client/src/main/app/i18n/de.js similarity index 100% rename from src/main/app/i18n/de.js rename to commafeed-client/src/main/app/i18n/de.js diff --git a/src/main/app/i18n/en.js b/commafeed-client/src/main/app/i18n/en.js similarity index 100% rename from src/main/app/i18n/en.js rename to commafeed-client/src/main/app/i18n/en.js diff --git a/src/main/app/i18n/es.js b/commafeed-client/src/main/app/i18n/es.js similarity index 100% rename from src/main/app/i18n/es.js rename to commafeed-client/src/main/app/i18n/es.js diff --git a/src/main/app/i18n/fa.js b/commafeed-client/src/main/app/i18n/fa.js similarity index 100% rename from src/main/app/i18n/fa.js rename to commafeed-client/src/main/app/i18n/fa.js diff --git a/src/main/app/i18n/fi.js b/commafeed-client/src/main/app/i18n/fi.js similarity index 100% rename from src/main/app/i18n/fi.js rename to commafeed-client/src/main/app/i18n/fi.js diff --git a/src/main/app/i18n/fr.js b/commafeed-client/src/main/app/i18n/fr.js similarity index 100% rename from src/main/app/i18n/fr.js rename to commafeed-client/src/main/app/i18n/fr.js diff --git a/src/main/app/i18n/gl.js b/commafeed-client/src/main/app/i18n/gl.js similarity index 100% rename from src/main/app/i18n/gl.js rename to commafeed-client/src/main/app/i18n/gl.js diff --git a/src/main/app/i18n/glk.js b/commafeed-client/src/main/app/i18n/glk.js similarity index 100% rename from src/main/app/i18n/glk.js rename to commafeed-client/src/main/app/i18n/glk.js diff --git a/src/main/app/i18n/hu.js b/commafeed-client/src/main/app/i18n/hu.js similarity index 100% rename from src/main/app/i18n/hu.js rename to commafeed-client/src/main/app/i18n/hu.js diff --git a/src/main/app/i18n/id.js b/commafeed-client/src/main/app/i18n/id.js similarity index 100% rename from src/main/app/i18n/id.js rename to commafeed-client/src/main/app/i18n/id.js diff --git a/src/main/app/i18n/it.js b/commafeed-client/src/main/app/i18n/it.js similarity index 100% rename from src/main/app/i18n/it.js rename to commafeed-client/src/main/app/i18n/it.js diff --git a/src/main/app/i18n/ja.js b/commafeed-client/src/main/app/i18n/ja.js similarity index 100% rename from src/main/app/i18n/ja.js rename to commafeed-client/src/main/app/i18n/ja.js diff --git a/src/main/app/i18n/ko.js b/commafeed-client/src/main/app/i18n/ko.js similarity index 100% rename from src/main/app/i18n/ko.js rename to commafeed-client/src/main/app/i18n/ko.js diff --git a/src/main/app/i18n/ms.js b/commafeed-client/src/main/app/i18n/ms.js similarity index 100% rename from src/main/app/i18n/ms.js rename to commafeed-client/src/main/app/i18n/ms.js diff --git a/src/main/app/i18n/nb.js b/commafeed-client/src/main/app/i18n/nb.js similarity index 100% rename from src/main/app/i18n/nb.js rename to commafeed-client/src/main/app/i18n/nb.js diff --git a/src/main/app/i18n/nl.js b/commafeed-client/src/main/app/i18n/nl.js similarity index 100% rename from src/main/app/i18n/nl.js rename to commafeed-client/src/main/app/i18n/nl.js diff --git a/src/main/app/i18n/nn.js b/commafeed-client/src/main/app/i18n/nn.js similarity index 100% rename from src/main/app/i18n/nn.js rename to commafeed-client/src/main/app/i18n/nn.js diff --git a/src/main/app/i18n/pl.js b/commafeed-client/src/main/app/i18n/pl.js similarity index 100% rename from src/main/app/i18n/pl.js rename to commafeed-client/src/main/app/i18n/pl.js diff --git a/src/main/app/i18n/pt.js b/commafeed-client/src/main/app/i18n/pt.js similarity index 100% rename from src/main/app/i18n/pt.js rename to commafeed-client/src/main/app/i18n/pt.js diff --git a/src/main/app/i18n/ru.js b/commafeed-client/src/main/app/i18n/ru.js similarity index 100% rename from src/main/app/i18n/ru.js rename to commafeed-client/src/main/app/i18n/ru.js diff --git a/src/main/app/i18n/sk.js b/commafeed-client/src/main/app/i18n/sk.js similarity index 100% rename from src/main/app/i18n/sk.js rename to commafeed-client/src/main/app/i18n/sk.js diff --git a/src/main/app/i18n/sv.js b/commafeed-client/src/main/app/i18n/sv.js similarity index 100% rename from src/main/app/i18n/sv.js rename to commafeed-client/src/main/app/i18n/sv.js diff --git a/src/main/app/i18n/tr.js b/commafeed-client/src/main/app/i18n/tr.js similarity index 100% rename from src/main/app/i18n/tr.js rename to commafeed-client/src/main/app/i18n/tr.js diff --git a/src/main/app/i18n/zh.js b/commafeed-client/src/main/app/i18n/zh.js similarity index 100% rename from src/main/app/i18n/zh.js rename to commafeed-client/src/main/app/i18n/zh.js diff --git a/src/main/app/images/logo_2.png b/commafeed-client/src/main/app/images/logo_2.png similarity index 100% rename from src/main/app/images/logo_2.png rename to commafeed-client/src/main/app/images/logo_2.png diff --git a/src/main/app/images/preview.jpg b/commafeed-client/src/main/app/images/preview.jpg similarity index 100% rename from src/main/app/images/preview.jpg rename to commafeed-client/src/main/app/images/preview.jpg diff --git a/src/main/app/index.html b/commafeed-client/src/main/app/index.html similarity index 100% rename from src/main/app/index.html rename to commafeed-client/src/main/app/index.html diff --git a/src/main/app/js/controllers.js b/commafeed-client/src/main/app/js/controllers.js similarity index 100% rename from src/main/app/js/controllers.js rename to commafeed-client/src/main/app/js/controllers.js diff --git a/src/main/app/js/directives.js b/commafeed-client/src/main/app/js/directives.js similarity index 100% rename from src/main/app/js/directives.js rename to commafeed-client/src/main/app/js/directives.js diff --git a/src/main/app/js/filters.js b/commafeed-client/src/main/app/js/filters.js similarity index 100% rename from src/main/app/js/filters.js rename to commafeed-client/src/main/app/js/filters.js diff --git a/src/main/app/js/i18n.js b/commafeed-client/src/main/app/js/i18n.js similarity index 100% rename from src/main/app/js/i18n.js rename to commafeed-client/src/main/app/js/i18n.js diff --git a/src/main/app/js/main.js b/commafeed-client/src/main/app/js/main.js similarity index 100% rename from src/main/app/js/main.js rename to commafeed-client/src/main/app/js/main.js diff --git a/src/main/app/js/services.js b/commafeed-client/src/main/app/js/services.js similarity index 100% rename from src/main/app/js/services.js rename to commafeed-client/src/main/app/js/services.js diff --git a/src/main/app/js/welcome.js b/commafeed-client/src/main/app/js/welcome.js similarity index 100% rename from src/main/app/js/welcome.js rename to commafeed-client/src/main/app/js/welcome.js diff --git a/src/main/app/manifest.json b/commafeed-client/src/main/app/manifest.json similarity index 100% rename from src/main/app/manifest.json rename to commafeed-client/src/main/app/manifest.json diff --git a/src/main/app/metro-icon-150.png b/commafeed-client/src/main/app/metro-icon-150.png similarity index 100% rename from src/main/app/metro-icon-150.png rename to commafeed-client/src/main/app/metro-icon-150.png diff --git a/src/main/app/metro-icon-70.png b/commafeed-client/src/main/app/metro-icon-70.png similarity index 100% rename from src/main/app/metro-icon-70.png rename to commafeed-client/src/main/app/metro-icon-70.png diff --git a/src/main/app/sass/app.scss b/commafeed-client/src/main/app/sass/app.scss similarity index 100% rename from src/main/app/sass/app.scss rename to commafeed-client/src/main/app/sass/app.scss diff --git a/src/main/app/sass/base/.gitkeep b/commafeed-client/src/main/app/sass/base/.gitkeep similarity index 100% rename from src/main/app/sass/base/.gitkeep rename to commafeed-client/src/main/app/sass/base/.gitkeep diff --git a/src/main/app/sass/components/_admin-panel.scss b/commafeed-client/src/main/app/sass/components/_admin-panel.scss similarity index 100% rename from src/main/app/sass/components/_admin-panel.scss rename to commafeed-client/src/main/app/sass/components/_admin-panel.scss diff --git a/src/main/app/sass/components/_entry-list.scss b/commafeed-client/src/main/app/sass/components/_entry-list.scss similarity index 100% rename from src/main/app/sass/components/_entry-list.scss rename to commafeed-client/src/main/app/sass/components/_entry-list.scss diff --git a/src/main/app/sass/components/_help.scss b/commafeed-client/src/main/app/sass/components/_help.scss similarity index 100% rename from src/main/app/sass/components/_help.scss rename to commafeed-client/src/main/app/sass/components/_help.scss diff --git a/src/main/app/sass/components/_loading-bar.scss b/commafeed-client/src/main/app/sass/components/_loading-bar.scss similarity index 100% rename from src/main/app/sass/components/_loading-bar.scss rename to commafeed-client/src/main/app/sass/components/_loading-bar.scss diff --git a/src/main/app/sass/components/_subscription-list.scss b/commafeed-client/src/main/app/sass/components/_subscription-list.scss similarity index 100% rename from src/main/app/sass/components/_subscription-list.scss rename to commafeed-client/src/main/app/sass/components/_subscription-list.scss diff --git a/src/main/app/sass/components/_toolbar.scss b/commafeed-client/src/main/app/sass/components/_toolbar.scss similarity index 100% rename from src/main/app/sass/components/_toolbar.scss rename to commafeed-client/src/main/app/sass/components/_toolbar.scss diff --git a/src/main/app/sass/components/zocial.scss b/commafeed-client/src/main/app/sass/components/zocial.scss similarity index 100% rename from src/main/app/sass/components/zocial.scss rename to commafeed-client/src/main/app/sass/components/zocial.scss diff --git a/src/main/app/sass/generic/_misc.scss b/commafeed-client/src/main/app/sass/generic/_misc.scss similarity index 100% rename from src/main/app/sass/generic/_misc.scss rename to commafeed-client/src/main/app/sass/generic/_misc.scss diff --git a/src/main/app/sass/generic/_scrollbar.scss b/commafeed-client/src/main/app/sass/generic/_scrollbar.scss similarity index 100% rename from src/main/app/sass/generic/_scrollbar.scss rename to commafeed-client/src/main/app/sass/generic/_scrollbar.scss diff --git a/src/main/app/sass/mobile/_mobile.scss b/commafeed-client/src/main/app/sass/mobile/_mobile.scss similarity index 100% rename from src/main/app/sass/mobile/_mobile.scss rename to commafeed-client/src/main/app/sass/mobile/_mobile.scss diff --git a/src/main/app/sass/themes/_MRACHINI.scss b/commafeed-client/src/main/app/sass/themes/_MRACHINI.scss similarity index 100% rename from src/main/app/sass/themes/_MRACHINI.scss rename to commafeed-client/src/main/app/sass/themes/_MRACHINI.scss diff --git a/src/main/app/sass/themes/_bootstrap.scss b/commafeed-client/src/main/app/sass/themes/_bootstrap.scss similarity index 100% rename from src/main/app/sass/themes/_bootstrap.scss rename to commafeed-client/src/main/app/sass/themes/_bootstrap.scss diff --git a/src/main/app/sass/themes/_dark.scss b/commafeed-client/src/main/app/sass/themes/_dark.scss similarity index 100% rename from src/main/app/sass/themes/_dark.scss rename to commafeed-client/src/main/app/sass/themes/_dark.scss diff --git a/src/main/app/sass/themes/_ebraminio.scss b/commafeed-client/src/main/app/sass/themes/_ebraminio.scss similarity index 100% rename from src/main/app/sass/themes/_ebraminio.scss rename to commafeed-client/src/main/app/sass/themes/_ebraminio.scss diff --git a/src/main/app/sass/themes/_nightsky.scss b/commafeed-client/src/main/app/sass/themes/_nightsky.scss similarity index 100% rename from src/main/app/sass/themes/_nightsky.scss rename to commafeed-client/src/main/app/sass/themes/_nightsky.scss diff --git a/src/main/app/sass/themes/_svetla.scss b/commafeed-client/src/main/app/sass/themes/_svetla.scss similarity index 100% rename from src/main/app/sass/themes/_svetla.scss rename to commafeed-client/src/main/app/sass/themes/_svetla.scss diff --git a/src/main/app/sass/themes/_test.scss b/commafeed-client/src/main/app/sass/themes/_test.scss similarity index 100% rename from src/main/app/sass/themes/_test.scss rename to commafeed-client/src/main/app/sass/themes/_test.scss diff --git a/src/main/app/sass/themes/_third.scss b/commafeed-client/src/main/app/sass/themes/_third.scss similarity index 100% rename from src/main/app/sass/themes/_third.scss rename to commafeed-client/src/main/app/sass/themes/_third.scss diff --git a/src/main/app/templates/_category.html b/commafeed-client/src/main/app/templates/_category.html similarity index 100% rename from src/main/app/templates/_category.html rename to commafeed-client/src/main/app/templates/_category.html diff --git a/src/main/app/templates/_feedsearch.html b/commafeed-client/src/main/app/templates/_feedsearch.html similarity index 100% rename from src/main/app/templates/_feedsearch.html rename to commafeed-client/src/main/app/templates/_feedsearch.html diff --git a/src/main/app/templates/_footer.html b/commafeed-client/src/main/app/templates/_footer.html similarity index 100% rename from src/main/app/templates/_footer.html rename to commafeed-client/src/main/app/templates/_footer.html diff --git a/src/main/app/templates/_metrics.gauge.html b/commafeed-client/src/main/app/templates/_metrics.gauge.html similarity index 100% rename from src/main/app/templates/_metrics.gauge.html rename to commafeed-client/src/main/app/templates/_metrics.gauge.html diff --git a/src/main/app/templates/_metrics.meter.html b/commafeed-client/src/main/app/templates/_metrics.meter.html similarity index 100% rename from src/main/app/templates/_metrics.meter.html rename to commafeed-client/src/main/app/templates/_metrics.meter.html diff --git a/src/main/app/templates/_metrics.timer.html b/commafeed-client/src/main/app/templates/_metrics.timer.html similarity index 100% rename from src/main/app/templates/_metrics.timer.html rename to commafeed-client/src/main/app/templates/_metrics.timer.html diff --git a/src/main/app/templates/_shortcuts.html b/commafeed-client/src/main/app/templates/_shortcuts.html similarity index 100% rename from src/main/app/templates/_shortcuts.html rename to commafeed-client/src/main/app/templates/_shortcuts.html diff --git a/src/main/app/templates/_tags.html b/commafeed-client/src/main/app/templates/_tags.html similarity index 100% rename from src/main/app/templates/_tags.html rename to commafeed-client/src/main/app/templates/_tags.html diff --git a/src/main/app/templates/_toolbar.html b/commafeed-client/src/main/app/templates/_toolbar.html similarity index 100% rename from src/main/app/templates/_toolbar.html rename to commafeed-client/src/main/app/templates/_toolbar.html diff --git a/src/main/app/templates/_tree.html b/commafeed-client/src/main/app/templates/_tree.html similarity index 100% rename from src/main/app/templates/_tree.html rename to commafeed-client/src/main/app/templates/_tree.html diff --git a/src/main/app/templates/admin.html b/commafeed-client/src/main/app/templates/admin.html similarity index 100% rename from src/main/app/templates/admin.html rename to commafeed-client/src/main/app/templates/admin.html diff --git a/src/main/app/templates/admin.metrics.html b/commafeed-client/src/main/app/templates/admin.metrics.html similarity index 100% rename from src/main/app/templates/admin.metrics.html rename to commafeed-client/src/main/app/templates/admin.metrics.html diff --git a/src/main/app/templates/admin.settings.html b/commafeed-client/src/main/app/templates/admin.settings.html similarity index 100% rename from src/main/app/templates/admin.settings.html rename to commafeed-client/src/main/app/templates/admin.settings.html diff --git a/src/main/app/templates/admin.useradd.html b/commafeed-client/src/main/app/templates/admin.useradd.html similarity index 100% rename from src/main/app/templates/admin.useradd.html rename to commafeed-client/src/main/app/templates/admin.useradd.html diff --git a/src/main/app/templates/admin.useredit.html b/commafeed-client/src/main/app/templates/admin.useredit.html similarity index 100% rename from src/main/app/templates/admin.useredit.html rename to commafeed-client/src/main/app/templates/admin.useredit.html diff --git a/src/main/app/templates/admin.userlist.html b/commafeed-client/src/main/app/templates/admin.userlist.html similarity index 100% rename from src/main/app/templates/admin.userlist.html rename to commafeed-client/src/main/app/templates/admin.userlist.html diff --git a/src/main/app/templates/feeds.category_details.html b/commafeed-client/src/main/app/templates/feeds.category_details.html similarity index 100% rename from src/main/app/templates/feeds.category_details.html rename to commafeed-client/src/main/app/templates/feeds.category_details.html diff --git a/src/main/app/templates/feeds.feed_details.html b/commafeed-client/src/main/app/templates/feeds.feed_details.html similarity index 100% rename from src/main/app/templates/feeds.feed_details.html rename to commafeed-client/src/main/app/templates/feeds.feed_details.html diff --git a/src/main/app/templates/feeds.help.html b/commafeed-client/src/main/app/templates/feeds.help.html similarity index 100% rename from src/main/app/templates/feeds.help.html rename to commafeed-client/src/main/app/templates/feeds.help.html diff --git a/src/main/app/templates/feeds.html b/commafeed-client/src/main/app/templates/feeds.html similarity index 100% rename from src/main/app/templates/feeds.html rename to commafeed-client/src/main/app/templates/feeds.html diff --git a/src/main/app/templates/feeds.import.html b/commafeed-client/src/main/app/templates/feeds.import.html similarity index 100% rename from src/main/app/templates/feeds.import.html rename to commafeed-client/src/main/app/templates/feeds.import.html diff --git a/src/main/app/templates/feeds.new_category.html b/commafeed-client/src/main/app/templates/feeds.new_category.html similarity index 100% rename from src/main/app/templates/feeds.new_category.html rename to commafeed-client/src/main/app/templates/feeds.new_category.html diff --git a/src/main/app/templates/feeds.subscribe.html b/commafeed-client/src/main/app/templates/feeds.subscribe.html similarity index 100% rename from src/main/app/templates/feeds.subscribe.html rename to commafeed-client/src/main/app/templates/feeds.subscribe.html diff --git a/src/main/app/templates/feeds.tag_details.html b/commafeed-client/src/main/app/templates/feeds.tag_details.html similarity index 100% rename from src/main/app/templates/feeds.tag_details.html rename to commafeed-client/src/main/app/templates/feeds.tag_details.html diff --git a/src/main/app/templates/feeds.view.html b/commafeed-client/src/main/app/templates/feeds.view.html similarity index 100% rename from src/main/app/templates/feeds.view.html rename to commafeed-client/src/main/app/templates/feeds.view.html diff --git a/src/main/app/templates/profile.html b/commafeed-client/src/main/app/templates/profile.html similarity index 100% rename from src/main/app/templates/profile.html rename to commafeed-client/src/main/app/templates/profile.html diff --git a/src/main/app/templates/settings.html b/commafeed-client/src/main/app/templates/settings.html similarity index 100% rename from src/main/app/templates/settings.html rename to commafeed-client/src/main/app/templates/settings.html diff --git a/src/main/app/templates/welcome.html b/commafeed-client/src/main/app/templates/welcome.html similarity index 100% rename from src/main/app/templates/welcome.html rename to commafeed-client/src/main/app/templates/welcome.html diff --git a/commafeed-server/.gitignore b/commafeed-server/.gitignore new file mode 100644 index 00000000..0fb007ab --- /dev/null +++ b/commafeed-server/.gitignore @@ -0,0 +1,39 @@ +# config file +config.yml + +# build directory +target +target-ide + +# database files +database + +# log files +log + +# jetty sessions +sessions + +# node +node +node_modules + +# bower +src/main/app/lib + +# Eclipse files +.project +.classpath +.settings +.factorypath +.checkstyle + +# IntelliJ Idea files +.idea +*.iml + +# Sublime +*.sublime* + +# Macs +*.DS_Store diff --git a/config.dev.yml b/commafeed-server/config.dev.yml similarity index 100% rename from config.dev.yml rename to commafeed-server/config.dev.yml diff --git a/config.yml.example b/commafeed-server/config.yml.example similarity index 100% rename from config.yml.example rename to commafeed-server/config.yml.example diff --git a/dev/EclipseCodeFormatter.xml b/commafeed-server/dev/EclipseCodeFormatter.xml similarity index 100% rename from dev/EclipseCodeFormatter.xml rename to commafeed-server/dev/EclipseCodeFormatter.xml diff --git a/dev/checkstyle.xml b/commafeed-server/dev/checkstyle.xml similarity index 100% rename from dev/checkstyle.xml rename to commafeed-server/dev/checkstyle.xml diff --git a/docker-compose.dev.yml b/commafeed-server/docker-compose.dev.yml similarity index 100% rename from docker-compose.dev.yml rename to commafeed-server/docker-compose.dev.yml diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml new file mode 100644 index 00000000..3028d1bf --- /dev/null +++ b/commafeed-server/pom.xml @@ -0,0 +1,494 @@ + + + 4.0.0 + + + com.commafeed + commafeed + ${revision} + + commafeed-server + CommaFeed Server + + + 5.1.0 + 4.2.1 + 1.18.0 + + + + + + io.dropwizard + dropwizard-dependencies + 2.1.1 + pom + import + + + + + + commafeed + + + src/main/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + + + + integration-test + verify + + + + + + pl.project13.maven + git-commit-id-plugin + 2.1.13 + + + + revision + + + + + false + false + false + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + org.kordamp.shade + maven-shade-ext-transformers + 1.4.0 + + + + false + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + + com.commafeed.CommaFeedApplication + + + + rome.properties + + append + + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.7 + + + + + + com.commafeed.frontend.resource + com.commafeed.frontend.model + com.commafeed.frontend.model.request + + target/swagger + /rest + + CommaFeed + ${project.version} + + + com.commafeed.backend.model.User + + + + + + + compile + + generate + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + + true + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.0 + + + validate + validate + + check + + + + + true + true + false + + ${project.build.sourceDirectory} + + + ${project.build.testSourceDirectory} + + true + dev/checkstyle.xml + + + + com.diffplug.spotless + spotless-maven-plugin + 1.27.0 + + + + validate + + check + + + + + UTF-8 + WINDOWS + + + ${project.basedir}/dev/EclipseCodeFormatter.xml + + + + + + + + + + com.commafeed + commafeed-client + ${revision} + + + + org.projectlombok + lombok + 1.18.22 + provided + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + + com.google.inject + guice + ${guice.version} + + + + io.dropwizard + dropwizard-core + + + io.dropwizard + dropwizard-hibernate + + + org.liquibase + liquibase-core + + + io.dropwizard + dropwizard-assets + + + io.dropwizard + dropwizard-forms + + + io.dropwizard.metrics + metrics-graphite + + + io.dropwizard.metrics + metrics-json + + + io.dropwizard.modules + dropwizard-web + 1.5.0 + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + + com.fasterxml.jackson.module + jackson-module-afterburner + + + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + + + + io.swagger + swagger-annotations + 1.5.22 + + + + com.querydsl + querydsl-apt + ${querydsl.version} + provided + hibernate + + + com.querydsl + querydsl-jpa + ${querydsl.version} + + + + commons-io + commons-io + 2.11.0 + + + org.apache.commons + commons-collections4 + 4.4 + + + commons-codec + commons-codec + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.apache.commons + commons-jexl + 2.1.1 + + + commons-logging + commons-logging + + + + + org.passay + passay + 1.6.1 + + + + redis.clients + jedis + 2.7.2 + + + com.sun.mail + javax.mail + 1.5.3 + + + + com.rometools + rome + ${rome.version} + + + com.rometools + rome-modules + ${rome.version} + + + com.rometools + rome-opml + ${rome.version} + + + + org.ahocorasick + ahocorasick + 0.6.3 + + + org.jsoup + jsoup + 1.14.3 + + + com.ibm.icu + icu4j + 70.1 + + + net.sourceforge.cssparser + cssparser + 0.9.29 + + + edu.uci.ics + crawler4j + 3.5 + + + log4j + log4j + + + + + com.google.gwt + gwt-servlet + 2.9.0 + + + io.github.hakky54 + sslcontext-kickstart + 7.2.0 + + + + com.google.apis + google-api-services-youtube + v3-rev139-1.20.0 + + + com.google.guava + guava-jdk5 + + + + + + com.h2database + h2 + + + mysql + mysql-connector-java + 8.0.28 + + + org.postgresql + postgresql + 42.4.1 + + + net.sourceforge.jtds + jtds + 1.3.1 + + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-core + test + + + org.mock-server + mockserver-junit-jupiter + 5.13.2 + test + + + io.dropwizard + dropwizard-testing + test + + + org.awaitility + awaitility + test + + + \ No newline at end of file diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java similarity index 100% rename from src/main/java/com/commafeed/CommaFeedApplication.java rename to commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java diff --git a/src/main/java/com/commafeed/CommaFeedConfiguration.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java similarity index 100% rename from src/main/java/com/commafeed/CommaFeedConfiguration.java rename to commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java diff --git a/src/main/java/com/commafeed/CommaFeedModule.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java similarity index 100% rename from src/main/java/com/commafeed/CommaFeedModule.java rename to commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java diff --git a/src/main/java/com/commafeed/backend/ContentEncodingInterceptor.java b/commafeed-server/src/main/java/com/commafeed/backend/ContentEncodingInterceptor.java similarity index 100% rename from src/main/java/com/commafeed/backend/ContentEncodingInterceptor.java rename to commafeed-server/src/main/java/com/commafeed/backend/ContentEncodingInterceptor.java diff --git a/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java b/commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java similarity index 100% rename from src/main/java/com/commafeed/backend/FixedSizeSortedSet.java rename to commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java similarity index 100% rename from src/main/java/com/commafeed/backend/HttpGetter.java rename to commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java diff --git a/src/main/java/com/commafeed/backend/cache/CacheService.java b/commafeed-server/src/main/java/com/commafeed/backend/cache/CacheService.java similarity index 100% rename from src/main/java/com/commafeed/backend/cache/CacheService.java rename to commafeed-server/src/main/java/com/commafeed/backend/cache/CacheService.java diff --git a/src/main/java/com/commafeed/backend/cache/NoopCacheService.java b/commafeed-server/src/main/java/com/commafeed/backend/cache/NoopCacheService.java similarity index 100% rename from src/main/java/com/commafeed/backend/cache/NoopCacheService.java rename to commafeed-server/src/main/java/com/commafeed/backend/cache/NoopCacheService.java diff --git a/src/main/java/com/commafeed/backend/cache/RedisCacheService.java b/commafeed-server/src/main/java/com/commafeed/backend/cache/RedisCacheService.java similarity index 100% rename from src/main/java/com/commafeed/backend/cache/RedisCacheService.java rename to commafeed-server/src/main/java/com/commafeed/backend/cache/RedisCacheService.java diff --git a/src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java b/commafeed-server/src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java similarity index 100% rename from src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java rename to commafeed-server/src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/GenericDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/UnitOfWork.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/UnitOfWork.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java diff --git a/src/main/java/com/commafeed/backend/dao/UserDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/UserDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/UserRoleDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java diff --git a/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java similarity index 100% rename from src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java rename to commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java diff --git a/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java similarity index 100% rename from src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java rename to commafeed-server/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java diff --git a/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java similarity index 100% rename from src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java rename to commafeed-server/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java diff --git a/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java similarity index 100% rename from src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java rename to commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java diff --git a/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java similarity index 100% rename from src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java rename to commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedFetcher.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedParser.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedParser.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedQueues.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedQueues.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedQueues.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedQueues.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshContext.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshContext.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedRefreshContext.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshContext.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshExecutor.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshExecutor.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedRefreshExecutor.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshExecutor.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshTaskGiver.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshTaskGiver.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedRefreshTaskGiver.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshTaskGiver.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java diff --git a/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FeedUtils.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java diff --git a/src/main/java/com/commafeed/backend/feed/FetchedFeed.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FetchedFeed.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/FetchedFeed.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FetchedFeed.java diff --git a/src/main/java/com/commafeed/backend/feed/HtmlEntities.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/HtmlEntities.java similarity index 100% rename from src/main/java/com/commafeed/backend/feed/HtmlEntities.java rename to commafeed-server/src/main/java/com/commafeed/backend/feed/HtmlEntities.java diff --git a/src/main/java/com/commafeed/backend/model/AbstractModel.java b/commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/AbstractModel.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/Feed.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java diff --git a/src/main/java/com/commafeed/backend/model/FeedCategory.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedCategory.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java diff --git a/src/main/java/com/commafeed/backend/model/FeedEntry.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedEntry.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedEntryContent.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedEntryStatus.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryTag.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedEntryTag.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java diff --git a/src/main/java/com/commafeed/backend/model/FeedSubscription.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/FeedSubscription.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java diff --git a/src/main/java/com/commafeed/backend/model/Models.java b/commafeed-server/src/main/java/com/commafeed/backend/model/Models.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/Models.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/Models.java diff --git a/src/main/java/com/commafeed/backend/model/User.java b/commafeed-server/src/main/java/com/commafeed/backend/model/User.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/User.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/User.java diff --git a/src/main/java/com/commafeed/backend/model/UserRole.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/UserRole.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java similarity index 100% rename from src/main/java/com/commafeed/backend/model/UserSettings.java rename to commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java diff --git a/src/main/java/com/commafeed/backend/opml/OPMLExporter.java b/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java similarity index 100% rename from src/main/java/com/commafeed/backend/opml/OPMLExporter.java rename to commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java diff --git a/src/main/java/com/commafeed/backend/opml/OPMLImporter.java b/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java similarity index 100% rename from src/main/java/com/commafeed/backend/opml/OPMLImporter.java rename to commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java diff --git a/src/main/java/com/commafeed/backend/rome/OPML11Generator.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Generator.java similarity index 100% rename from src/main/java/com/commafeed/backend/rome/OPML11Generator.java rename to commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Generator.java diff --git a/src/main/java/com/commafeed/backend/rome/OPML11Parser.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java similarity index 100% rename from src/main/java/com/commafeed/backend/rome/OPML11Parser.java rename to commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java diff --git a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java similarity index 100% rename from src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java rename to commafeed-server/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java diff --git a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java similarity index 100% rename from src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java rename to commafeed-server/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java diff --git a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java similarity index 100% rename from src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java rename to commafeed-server/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java diff --git a/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedEntryContentService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedEntryService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedEntryService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedEntryTagService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java diff --git a/src/main/java/com/commafeed/backend/service/FeedUpdateService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedUpdateService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/FeedUpdateService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/FeedUpdateService.java diff --git a/src/main/java/com/commafeed/backend/service/MailService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/MailService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java diff --git a/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java diff --git a/src/main/java/com/commafeed/backend/service/PubSubService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/PubSubService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java diff --git a/src/main/java/com/commafeed/backend/service/StartupService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/StartupService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/StartupService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/StartupService.java diff --git a/src/main/java/com/commafeed/backend/service/UserService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/UserService.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java diff --git a/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java b/commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java similarity index 100% rename from src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java rename to commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java diff --git a/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java diff --git a/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java diff --git a/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java diff --git a/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java diff --git a/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java diff --git a/src/main/java/com/commafeed/backend/task/ScheduledTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/ScheduledTask.java similarity index 100% rename from src/main/java/com/commafeed/backend/task/ScheduledTask.java rename to commafeed-server/src/main/java/com/commafeed/backend/task/ScheduledTask.java diff --git a/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java b/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java similarity index 100% rename from src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java rename to commafeed-server/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java diff --git a/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java b/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java similarity index 100% rename from src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java rename to commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java diff --git a/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java b/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java similarity index 100% rename from src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java rename to commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java diff --git a/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java similarity index 100% rename from src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java rename to commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java diff --git a/src/main/java/com/commafeed/frontend/auth/SecurityCheck.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheck.java similarity index 100% rename from src/main/java/com/commafeed/frontend/auth/SecurityCheck.java rename to commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheck.java diff --git a/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java similarity index 100% rename from src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java rename to commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java diff --git a/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java similarity index 100% rename from src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java rename to commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java diff --git a/src/main/java/com/commafeed/frontend/auth/ValidPassword.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java similarity index 100% rename from src/main/java/com/commafeed/frontend/auth/ValidPassword.java rename to commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java diff --git a/src/main/java/com/commafeed/frontend/model/Category.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/Category.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java diff --git a/src/main/java/com/commafeed/frontend/model/Entries.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entries.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/Entries.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/Entries.java diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/Entry.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java diff --git a/src/main/java/com/commafeed/frontend/model/FeedInfo.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/FeedInfo.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/FeedInfo.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/FeedInfo.java diff --git a/src/main/java/com/commafeed/frontend/model/ServerInfo.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/ServerInfo.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java diff --git a/src/main/java/com/commafeed/frontend/model/Settings.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/Settings.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java diff --git a/src/main/java/com/commafeed/frontend/model/Subscription.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Subscription.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/Subscription.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/Subscription.java diff --git a/src/main/java/com/commafeed/frontend/model/UnreadCount.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/UnreadCount.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/UnreadCount.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/UnreadCount.java diff --git a/src/main/java/com/commafeed/frontend/model/UserModel.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/UserModel.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/UserModel.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/UserModel.java diff --git a/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/IDRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/IDRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/IDRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/IDRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/LoginRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/MarkRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/StarRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/StarRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/StarRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/StarRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java diff --git a/src/main/java/com/commafeed/frontend/model/request/TagRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/TagRequest.java similarity index 100% rename from src/main/java/com/commafeed/frontend/model/request/TagRequest.java rename to commafeed-server/src/main/java/com/commafeed/frontend/model/request/TagRequest.java diff --git a/src/main/java/com/commafeed/frontend/resource/AdminREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/AdminREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/CategoryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/CategoryREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/EntryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/EntryREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/FeedREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/ServerREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/ServerREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java similarity index 100% rename from src/main/java/com/commafeed/frontend/resource/UserREST.java rename to commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java diff --git a/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java similarity index 100% rename from src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java rename to commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java diff --git a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java similarity index 100% rename from src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java rename to commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java diff --git a/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java similarity index 100% rename from src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java rename to commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java diff --git a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java similarity index 100% rename from src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java rename to commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java diff --git a/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java similarity index 100% rename from src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java rename to commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java diff --git a/src/main/java/com/commafeed/frontend/session/SessionHelper.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java similarity index 100% rename from src/main/java/com/commafeed/frontend/session/SessionHelper.java rename to commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java diff --git a/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java similarity index 100% rename from src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java rename to commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java diff --git a/src/main/resources/application.properties b/commafeed-server/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to commafeed-server/src/main/resources/application.properties diff --git a/src/main/resources/banner.txt b/commafeed-server/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to commafeed-server/src/main/resources/banner.txt diff --git a/src/main/resources/changelogs/db.changelog-1.0.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.0.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.0.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.0.xml diff --git a/src/main/resources/changelogs/db.changelog-1.1.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.1.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.1.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.1.xml diff --git a/src/main/resources/changelogs/db.changelog-1.2.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.2.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.2.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.2.xml diff --git a/src/main/resources/changelogs/db.changelog-1.3.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.3.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.3.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.3.xml diff --git a/src/main/resources/changelogs/db.changelog-1.4.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.4.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.4.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.4.xml diff --git a/src/main/resources/changelogs/db.changelog-1.5.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-1.5.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-1.5.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-1.5.xml diff --git a/src/main/resources/changelogs/db.changelog-2.1.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-2.1.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-2.1.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-2.1.xml diff --git a/src/main/resources/changelogs/db.changelog-2.2.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-2.2.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-2.2.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-2.2.xml diff --git a/src/main/resources/changelogs/db.changelog-2.6.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-2.6.xml similarity index 100% rename from src/main/resources/changelogs/db.changelog-2.6.xml rename to commafeed-server/src/main/resources/changelogs/db.changelog-2.6.xml diff --git a/src/main/resources/images/default_favicon.gif b/commafeed-server/src/main/resources/images/default_favicon.gif similarity index 100% rename from src/main/resources/images/default_favicon.gif rename to commafeed-server/src/main/resources/images/default_favicon.gif diff --git a/src/main/resources/migrations.xml b/commafeed-server/src/main/resources/migrations.xml similarity index 100% rename from src/main/resources/migrations.xml rename to commafeed-server/src/main/resources/migrations.xml diff --git a/src/main/resources/rome.properties b/commafeed-server/src/main/resources/rome.properties similarity index 100% rename from src/main/resources/rome.properties rename to commafeed-server/src/main/resources/rome.properties diff --git a/src/test/java/com/commafeed/backend/FixedSizeSortedSetTest.java b/commafeed-server/src/test/java/com/commafeed/backend/FixedSizeSortedSetTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/FixedSizeSortedSetTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/FixedSizeSortedSetTest.java diff --git a/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java b/commafeed-server/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java diff --git a/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java b/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java diff --git a/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java b/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java diff --git a/src/test/java/com/commafeed/backend/service/FeedEntryFilteringServiceTest.java b/commafeed-server/src/test/java/com/commafeed/backend/service/FeedEntryFilteringServiceTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/service/FeedEntryFilteringServiceTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/service/FeedEntryFilteringServiceTest.java diff --git a/src/test/java/com/commafeed/backend/service/PubSubServiceTest.java b/commafeed-server/src/test/java/com/commafeed/backend/service/PubSubServiceTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/service/PubSubServiceTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/service/PubSubServiceTest.java diff --git a/src/test/java/com/commafeed/backend/service/UserServiceTest.java b/commafeed-server/src/test/java/com/commafeed/backend/service/UserServiceTest.java similarity index 100% rename from src/test/java/com/commafeed/backend/service/UserServiceTest.java rename to commafeed-server/src/test/java/com/commafeed/backend/service/UserServiceTest.java diff --git a/src/test/java/com/commafeed/frontend/auth/SecurityCheckFactoryTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/auth/SecurityCheckFactoryTest.java similarity index 100% rename from src/test/java/com/commafeed/frontend/auth/SecurityCheckFactoryTest.java rename to commafeed-server/src/test/java/com/commafeed/frontend/auth/SecurityCheckFactoryTest.java diff --git a/src/test/java/com/commafeed/frontend/resource/UserRestTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java similarity index 100% rename from src/test/java/com/commafeed/frontend/resource/UserRestTest.java rename to commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java diff --git a/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java similarity index 100% rename from src/test/java/com/commafeed/frontend/session/SessionHelperTest.java rename to commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java diff --git a/src/test/java/com/commafeed/integration/FeedIT.java b/commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java similarity index 100% rename from src/test/java/com/commafeed/integration/FeedIT.java rename to commafeed-server/src/test/java/com/commafeed/integration/FeedIT.java diff --git a/src/test/resources/config.test.yml b/commafeed-server/src/test/resources/config.test.yml similarity index 100% rename from src/test/resources/config.test.yml rename to commafeed-server/src/test/resources/config.test.yml diff --git a/src/test/resources/feed/rss.xml b/commafeed-server/src/test/resources/feed/rss.xml similarity index 100% rename from src/test/resources/feed/rss.xml rename to commafeed-server/src/test/resources/feed/rss.xml diff --git a/src/test/resources/logback-test.xml b/commafeed-server/src/test/resources/logback-test.xml similarity index 100% rename from src/test/resources/logback-test.xml rename to commafeed-server/src/test/resources/logback-test.xml diff --git a/src/test/resources/opml/opml_noversion.xml b/commafeed-server/src/test/resources/opml/opml_noversion.xml similarity index 100% rename from src/test/resources/opml/opml_noversion.xml rename to commafeed-server/src/test/resources/opml/opml_noversion.xml diff --git a/src/test/resources/opml/opml_v1.0.xml b/commafeed-server/src/test/resources/opml/opml_v1.0.xml similarity index 100% rename from src/test/resources/opml/opml_v1.0.xml rename to commafeed-server/src/test/resources/opml/opml_v1.0.xml diff --git a/src/test/resources/opml/opml_v1.1.xml b/commafeed-server/src/test/resources/opml/opml_v1.1.xml similarity index 100% rename from src/test/resources/opml/opml_v1.1.xml rename to commafeed-server/src/test/resources/opml/opml_v1.1.xml diff --git a/src/test/resources/opml/opml_v2.0.xml b/commafeed-server/src/test/resources/opml/opml_v2.0.xml similarity index 100% rename from src/test/resources/opml/opml_v2.0.xml rename to commafeed-server/src/test/resources/opml/opml_v2.0.xml diff --git a/pom.xml b/pom.xml index 3aaf3292..51c27db3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,275 +1,20 @@ - + 4.0.0 + com.commafeed commafeed - 2.6.0 + ${revision} CommaFeed + pom + 3.0.0 UTF-8 1.8 1.8 - 5.1.0 - 4.2.1 - 1.18.0 - - - - - io.dropwizard - dropwizard-dependencies - 2.1.1 - pom - import - - - - - - commafeed - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - - - integration-test - verify - - - - - - pl.project13.maven - git-commit-id-plugin - 2.1.13 - - - - revision - - - - - false - false - false - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - org.kordamp.shade - maven-shade-ext-transformers - 1.4.0 - - - - false - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - - com.commafeed.CommaFeedApplication - - - - rome.properties - - append - - - - - - - - com.github.kongchen - swagger-maven-plugin - 3.1.7 - - - - - - com.commafeed.frontend.resource - com.commafeed.frontend.model - com.commafeed.frontend.model.request - - target/swagger - /rest - - CommaFeed - ${project.version} - - - com.commafeed.backend.model.User - - - - - - - compile - - generate - - - - - - com.github.eirslett - frontend-maven-plugin - 1.6 - - - - install node and npm - - install-node-and-npm - - compile - - v6.11.4 - 3.10.6 - - - - npm install - - npm - - compile - - install - - - - bower install - - bower - - compile - - install - - - - gulp build - - gulp - - compile - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.2 - - - - true - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.0 - - - validate - validate - - check - - - - - true - true - false - - ${project.build.sourceDirectory} - - - ${project.build.testSourceDirectory} - - true - dev/checkstyle.xml - - - - com.diffplug.spotless - spotless-maven-plugin - 1.27.0 - - - - validate - - check - - - - - UTF-8 - WINDOWS - - - ${project.basedir}/dev/EclipseCodeFormatter.xml - - - - - - - + only-eclipse @@ -284,265 +29,9 @@ - - - org.projectlombok - lombok - 1.18.22 - provided - - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - + + commafeed-client + commafeed-server + - - com.google.inject - guice - ${guice.version} - - - - io.dropwizard - dropwizard-core - - - io.dropwizard - dropwizard-hibernate - - - org.liquibase - liquibase-core - - - io.dropwizard - dropwizard-assets - - - io.dropwizard - dropwizard-forms - - - io.dropwizard.metrics - metrics-graphite - - - io.dropwizard.metrics - metrics-json - - - io.dropwizard.modules - dropwizard-web - 1.5.0 - - - - javax.xml.bind - jaxb-api - 2.3.0 - - - - com.fasterxml.jackson.module - jackson-module-afterburner - - - - org.apache.httpcomponents - httpclient - - - commons-logging - commons-logging - - - - - - io.swagger - swagger-annotations - 1.5.22 - - - - com.querydsl - querydsl-apt - ${querydsl.version} - provided - hibernate - - - com.querydsl - querydsl-jpa - ${querydsl.version} - - - - commons-io - commons-io - 2.11.0 - - - org.apache.commons - commons-collections4 - 4.4 - - - commons-codec - commons-codec - - - org.apache.commons - commons-math3 - 3.6.1 - - - org.apache.commons - commons-jexl - 2.1.1 - - - commons-logging - commons-logging - - - - - org.passay - passay - 1.6.1 - - - - redis.clients - jedis - 2.7.2 - - - com.sun.mail - javax.mail - 1.5.3 - - - - com.rometools - rome - ${rome.version} - - - com.rometools - rome-modules - ${rome.version} - - - com.rometools - rome-opml - ${rome.version} - - - - org.ahocorasick - ahocorasick - 0.6.3 - - - org.jsoup - jsoup - 1.14.3 - - - com.ibm.icu - icu4j - 70.1 - - - net.sourceforge.cssparser - cssparser - 0.9.29 - - - edu.uci.ics - crawler4j - 3.5 - - - log4j - log4j - - - - - com.google.gwt - gwt-servlet - 2.9.0 - - - io.github.hakky54 - sslcontext-kickstart - 7.2.0 - - - - com.google.apis - google-api-services-youtube - v3-rev139-1.20.0 - - - com.google.guava - guava-jdk5 - - - - - - com.h2database - h2 - - - mysql - mysql-connector-java - 8.0.28 - - - org.postgresql - postgresql - 42.4.1 - - - net.sourceforge.jtds - jtds - 1.3.1 - - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-core - test - - - org.mock-server - mockserver-junit-jupiter - 5.13.2 - test - - - io.dropwizard - dropwizard-testing - test - - - org.awaitility - awaitility - test - - \ No newline at end of file