Skip to content

Commit a731fe1

Browse files
committed
site/maintenance: deleted.
It's not flexible to enable maintenance mode inside application by changing code of ServletFilter. Better manage it at proxy server side like nginx.
1 parent 9f2727e commit a731fe1

File tree

11 files changed

+0
-250
lines changed

11 files changed

+0
-250
lines changed

src/env/dev/WEB-INF/web.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,6 @@
5252
<location>/error/404</location>
5353
</error-page>
5454

55-
<filter>
56-
<filter-name>MaintenanceFilter</filter-name>
57-
<filter-class>
58-
ru.mystamps.web.filter.MaintenanceFilter
59-
</filter-class>
60-
<init-param>
61-
<param-name>enableMaintainanceMode</param-name>
62-
<param-value>no</param-value>
63-
</init-param>
64-
<init-param>
65-
<param-name>allowedIP</param-name>
66-
<param-value>127.0.0.1</param-value>
67-
</init-param>
68-
</filter>
69-
70-
<filter-mapping>
71-
<filter-name>MaintenanceFilter</filter-name>
72-
<url-pattern>/*</url-pattern>
73-
</filter-mapping>
74-
7555
<filter>
7656
<filter-name>CharsetFilter</filter-name>
7757
<filter-class>

src/env/test/WEB-INF/web.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,6 @@
6969
<location>/error/404</location>
7070
</error-page>
7171

72-
<filter>
73-
<filter-name>MaintenanceFilter</filter-name>
74-
<filter-class>
75-
ru.mystamps.web.filter.MaintenanceFilter
76-
</filter-class>
77-
<init-param>
78-
<param-name>enableMaintainanceMode</param-name>
79-
<param-value>no</param-value>
80-
</init-param>
81-
<init-param>
82-
<param-name>allowedIP</param-name>
83-
<param-value>127.0.0.1</param-value>
84-
</init-param>
85-
</filter>
86-
87-
<filter-mapping>
88-
<filter-name>MaintenanceFilter</filter-name>
89-
<url-pattern>/*</url-pattern>
90-
</filter-mapping>
91-
9272
<filter>
9373
<filter-name>CharsetFilter</filter-name>
9474
<filter-class>

src/main/java/ru/mystamps/web/SiteMap.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public final class SiteMap {
3333

3434
// defined at ru.mystamps.web.config.MvcConfig
3535
public static final String INDEX_PAGE_URL = "/";
36-
public static final String MAINTENANCE_PAGE_URL = "/site/maintenance";
3736
public static final String SUCCESSFUL_REGISTRATION_PAGE_URL = "/successful/registration";
3837
public static final String SUCCESSFUL_ACTIVATION_PAGE_URL = "/successful/activation";
3938

src/main/java/ru/mystamps/web/config/MvcConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.web.servlet.ViewResolver;
3434

3535
import static ru.mystamps.web.SiteMap.INDEX_PAGE_URL;
36-
import static ru.mystamps.web.SiteMap.MAINTENANCE_PAGE_URL;
3736
import static ru.mystamps.web.SiteMap.RESTORE_PASSWORD_PAGE_URL;
3837
import static ru.mystamps.web.SiteMap.SUCCESSFUL_ACTIVATION_PAGE_URL;
3938
import static ru.mystamps.web.SiteMap.SUCCESSFUL_REGISTRATION_PAGE_URL;
@@ -55,7 +54,6 @@ public void configureDefaultServletHandling(final DefaultServletHandlerConfigure
5554
@Override
5655
public void addViewControllers(final ViewControllerRegistry registry) {
5756
registry.addViewController(INDEX_PAGE_URL).setViewName("site/index");
58-
registry.addViewController(MAINTENANCE_PAGE_URL);
5957
registry.addViewController(RESTORE_PASSWORD_PAGE_URL);
6058
registry.addViewController(SUCCESSFUL_ACTIVATION_PAGE_URL);
6159
registry.addViewController(SUCCESSFUL_REGISTRATION_PAGE_URL);

src/main/java/ru/mystamps/web/filter/MaintenanceFilter.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/main/resources/ru/mystamps/i18n/Messages.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ t_activation_successful = Account successfully activated! Now you can pass <a hr
4848
t_404_title = 404: page not found
4949
t_404_description = Requested{0}page{0}not found
5050

51-
# site/maintenance.jsp
52-
t_maintenance_title = maintenance
53-
t_maintenance_on_site = Site at maintenance.{0}Please return later.
54-
5551
# account/auth.jsp
5652
t_auth_title = authentication
5753
t_authentication_on_site = Authentication on site

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ t_activation_successful = Аккаунт успешно активирован!
4848
t_404_title = 404: страница не найдена
4949
t_404_description = Запрашиваемая{0}вами страница{0}не найдена
5050

51-
# site/maintenance.jsp
52-
t_maintenance_title = технические работы
53-
t_maintenance_on_site = Сайт закрыт на техническое обслуживание.{0}Пожалуйста, зайдите позже.
54-
5551
# account/auth.jsp
5652
t_auth_title = идентификация
5753
t_authentication_on_site = Идентификация на сайте

src/main/webapp/WEB-INF/pages/site/maintenance.jsp

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/test/config/testng.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
</classes>
1414
</test>
1515

16-
<test name="When site on maintenance">
17-
<classes>
18-
<class name="ru.mystamps.web.tests.cases.WhenSiteOnMaintenance" />
19-
</classes>
20-
</test>
21-
2216
<test name="When user activate account">
2317
<classes>
2418
<class name="ru.mystamps.web.tests.cases.WhenUserActivateAccount" />

src/test/java/ru/mystamps/web/tests/cases/WhenSiteOnMaintenance.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/test/java/ru/mystamps/web/tests/page/MaintenanceSitePage.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)