Skip to content

Commit 146f62a

Browse files
committed
1 parent 3be4159 commit 146f62a

File tree

4 files changed

+198
-160
lines changed

4 files changed

+198
-160
lines changed

pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
<artifactId>maven-war-plugin</artifactId>
400400
<version>${war.plugin.version}</version>
401401
<configuration>
402-
<webXml>${env.dir}/../web.xml</webXml>
402+
<failOnMissingWebXml>false</failOnMissingWebXml>
403403
</configuration>
404404
</plugin>
405405

@@ -481,9 +481,6 @@
481481
<webAppSourceDirectory>
482482
${project.build.directory}/${project.build.finalName}
483483
</webAppSourceDirectory>
484-
<webAppConfig>
485-
<overrideDescriptor>${env.dir}/../web.xml</overrideDescriptor>
486-
</webAppConfig>
487484
<skip>${skipTests}</skip>
488485
</configuration>
489486
<executions>

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

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,6 @@
1212
<param-value>dev</param-value>
1313
</context-param>
1414

15-
<context-param>
16-
<param-name>contextClass</param-name>
17-
<param-value>
18-
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
19-
</param-value>
20-
</context-param>
21-
22-
<context-param>
23-
<param-name>contextConfigLocation</param-name>
24-
<param-value>ru.mystamps.web.config.ApplicationContext</param-value>
25-
</context-param>
26-
27-
<listener>
28-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
29-
</listener>
30-
31-
<!-- To expose user's request to AuthenticationFailureListener where we need it for logging -->
32-
<listener>
33-
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
34-
</listener>
35-
36-
<servlet>
37-
<servlet-name>spring</servlet-name>
38-
<servlet-class>
39-
org.springframework.web.servlet.DispatcherServlet
40-
</servlet-class>
41-
<init-param>
42-
<param-name>contextClass</param-name>
43-
<param-value>
44-
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
45-
</param-value>
46-
</init-param>
47-
<init-param>
48-
<param-name>contextConfigLocation</param-name>
49-
<param-value>
50-
ru.mystamps.web.config.DispatcherServletContext
51-
</param-value>
52-
</init-param>
53-
<load-on-startup>1</load-on-startup>
54-
</servlet>
55-
56-
<servlet-mapping>
57-
<servlet-name>spring</servlet-name>
58-
<url-pattern>/</url-pattern>
59-
</servlet-mapping>
60-
6115
<!-- see http://docs.oracle.com/javaee/5/tutorial/doc/bnajg.html -->
6216
<jsp-config>
6317
<jsp-property-group>
@@ -82,38 +36,6 @@
8236
<location>/error/404</location>
8337
</error-page>
8438

85-
<filter>
86-
<filter-name>CharsetFilter</filter-name>
87-
<filter-class>
88-
org.springframework.web.filter.CharacterEncodingFilter
89-
</filter-class>
90-
<init-param>
91-
<param-name>encoding</param-name>
92-
<param-value>UTF-8</param-value>
93-
</init-param>
94-
</filter>
95-
96-
<filter-mapping>
97-
<filter-name>CharsetFilter</filter-name>
98-
<url-pattern>/*</url-pattern>
99-
</filter-mapping>
100-
101-
<filter>
102-
<filter-name>springSecurityFilterChain</filter-name>
103-
<filter-class>
104-
org.springframework.web.filter.DelegatingFilterProxy
105-
</filter-class>
106-
</filter>
107-
108-
<filter-mapping>
109-
<filter-name>springSecurityFilterChain</filter-name>
110-
<url-pattern>/*</url-pattern>
111-
<dispatcher>REQUEST</dispatcher>
112-
113-
<!-- apply Spring Security authentication to error-pages -->
114-
<dispatcher>ERROR</dispatcher>
115-
</filter-mapping>
116-
11739
<session-config>
11840
<cookie-config>
11941
<http-only>true</http-only>

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

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,6 @@
1212
<param-value>test</param-value>
1313
</context-param>
1414

15-
<context-param>
16-
<param-name>contextClass</param-name>
17-
<param-value>
18-
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
19-
</param-value>
20-
</context-param>
21-
22-
<context-param>
23-
<param-name>contextConfigLocation</param-name>
24-
<param-value>ru.mystamps.web.config.ApplicationContext</param-value>
25-
</context-param>
26-
27-
<listener>
28-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
29-
</listener>
30-
31-
<!-- To expose user's request to AuthenticationFailureListener where we need it for logging -->
32-
<listener>
33-
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
34-
</listener>
35-
36-
<servlet>
37-
<servlet-name>spring</servlet-name>
38-
<servlet-class>
39-
org.springframework.web.servlet.DispatcherServlet
40-
</servlet-class>
41-
<init-param>
42-
<param-name>contextClass</param-name>
43-
<param-value>
44-
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
45-
</param-value>
46-
</init-param>
47-
<init-param>
48-
<param-name>contextConfigLocation</param-name>
49-
<param-value>
50-
ru.mystamps.web.config.DispatcherServletContext
51-
</param-value>
52-
</init-param>
53-
<load-on-startup>1</load-on-startup>
54-
</servlet>
55-
56-
<servlet-mapping>
57-
<servlet-name>spring</servlet-name>
58-
<url-pattern>/</url-pattern>
59-
</servlet-mapping>
60-
6115
<!--
6216
Web console for managing H2 database.
6317
@@ -99,38 +53,6 @@
9953
<location>/error/404</location>
10054
</error-page>
10155

102-
<filter>
103-
<filter-name>CharsetFilter</filter-name>
104-
<filter-class>
105-
org.springframework.web.filter.CharacterEncodingFilter
106-
</filter-class>
107-
<init-param>
108-
<param-name>encoding</param-name>
109-
<param-value>UTF-8</param-value>
110-
</init-param>
111-
</filter>
112-
113-
<filter-mapping>
114-
<filter-name>CharsetFilter</filter-name>
115-
<url-pattern>/*</url-pattern>
116-
</filter-mapping>
117-
118-
<filter>
119-
<filter-name>springSecurityFilterChain</filter-name>
120-
<filter-class>
121-
org.springframework.web.filter.DelegatingFilterProxy
122-
</filter-class>
123-
</filter>
124-
125-
<filter-mapping>
126-
<filter-name>springSecurityFilterChain</filter-name>
127-
<url-pattern>/*</url-pattern>
128-
<dispatcher>REQUEST</dispatcher>
129-
130-
<!-- apply Spring Security authentication to error-pages -->
131-
<dispatcher>ERROR</dispatcher>
132-
</filter-mapping>
133-
13456
<session-config>
13557
<cookie-config>
13658
<http-only>true</http-only>

0 commit comments

Comments
 (0)