From 69e7a6af07742a075716fa9c30087c68170f6dc6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 18 Feb 2018 01:07:19 +0300
Subject: server: merge rss
---
.../rss/configuration/RssAppConfiguration.java | 34 -------------
.../juick/rss/configuration/RssInitializer.java | 56 ----------------------
.../rss/configuration/RssMvcConfiguration.java | 47 ------------------
3 files changed, 137 deletions(-)
delete mode 100644 juick-rss/src/main/java/com/juick/rss/configuration/RssAppConfiguration.java
delete mode 100644 juick-rss/src/main/java/com/juick/rss/configuration/RssInitializer.java
delete mode 100644 juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
(limited to 'juick-rss/src/main/java/com/juick/rss/configuration')
diff --git a/juick-rss/src/main/java/com/juick/rss/configuration/RssAppConfiguration.java b/juick-rss/src/main/java/com/juick/rss/configuration/RssAppConfiguration.java
deleted file mode 100644
index 2069b14e..00000000
--- a/juick-rss/src/main/java/com/juick/rss/configuration/RssAppConfiguration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package com.juick.rss.configuration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-
-import javax.inject.Inject;
-
-/**
- * Created by aalexeev on 11/12/16.
- */
-@Configuration
-@PropertySource("classpath:juick.conf")
-public class RssAppConfiguration {
- @Inject
- private Environment env;
-}
diff --git a/juick-rss/src/main/java/com/juick/rss/configuration/RssInitializer.java b/juick-rss/src/main/java/com/juick/rss/configuration/RssInitializer.java
deleted file mode 100644
index 617da288..00000000
--- a/juick-rss/src/main/java/com/juick/rss/configuration/RssInitializer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package com.juick.rss.configuration;
-
-import org.apache.commons.codec.CharEncoding;
-import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-
-import javax.servlet.Filter;
-
-/**
- * Created by vt on 09/02/16.
- */
-public class RssInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
- @Override
- protected Class[] getRootConfigClasses() {
- return new Class[]{RssAppConfiguration.class};
- }
-
- @Override
- protected Class[] getServletConfigClasses() {
- return new Class[]{RssMvcConfiguration.class};
- }
-
- @Override
- protected String[] getServletMappings() {
- return new String[]{"/"};
- }
-
- @Override
- protected Filter[] getServletFilters() {
- CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(CharEncoding.UTF_8);
- return new Filter[]{characterEncodingFilter};
- }
-
- @Override
- protected String getServletName() {
- return "RSS dispatcher servlet";
- }
-}
diff --git a/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java b/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
deleted file mode 100644
index c9d69f99..00000000
--- a/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package com.juick.rss.configuration;
-
-import com.juick.rss.MessagesView;
-import com.juick.rss.RepliesView;
-import com.juick.server.configuration.BaseWebConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.view.BeanNameViewResolver;
-import org.springframework.web.servlet.view.feed.AbstractRssFeedView;
-
-/**
- * Created by vitalyster on 28.06.2016.
- */
-@Configuration
-@ComponentScan(basePackages = {"com.juick.rss"})
-public class RssMvcConfiguration extends BaseWebConfiguration {
- @Bean
- public BeanNameViewResolver beanNameViewResolver() {
- return new BeanNameViewResolver();
- }
- @Bean
- AbstractRssFeedView messages() {
- return new MessagesView();
- }
- @Bean
- AbstractRssFeedView replies() {
- return new RepliesView();
- }
-}
--
cgit v1.2.3