Skip to content

Commit d003094

Browse files
author
Eugen Paraschiv
committed
change in project structure
1 parent 4686bf0 commit d003094

4 files changed

Lines changed: 79 additions & 82 deletions

File tree

‎spring-security-basic-auth/.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>spring-security-basic-auth</name>
3+
<name>spring-security-mvc-basic-auth</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎spring-security-basic-auth/.settings/org.eclipse.wst.common.component‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2-
<wb-module deploy-name="spring-security-basic-auth">
2+
<wb-module deploy-name="spring-security-mvc-basic-auth">
33
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
44
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
55
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
66
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
7-
<property name="context-root" value="spring-security-basic-auth"/>
8-
<property name="java-output-path" value="/spring-security-basic-auth/target/classes"/>
7+
<property name="java-output-path" value="/spring-security-mvc-basic-auth/target/classes"/>
8+
<property name="context-root" value="spring-security-mvc-basic-auth"/>
99
</wb-module>
1010
</project-modules>

‎spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 33 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,37 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
4-
xsi:schemaLocation="
5-
http://java.sun.com/xml/ns/javaee
6-
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
7-
id="WebApp_ID" version="3.0">
8-
9-
<display-name>Spring Security Basic Auth Application</display-name>
10-
11-
<!-- Spring root -->
12-
<context-param>
13-
<param-name>contextClass</param-name>
14-
<param-value>
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
3+
<display-name>Spring Security Basic Auth Application</display-name>
4+
<context-param>
5+
<param-name>contextClass</param-name>
6+
<param-value>
157
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
168
</param-value>
17-
</context-param>
18-
<context-param>
19-
<param-name>contextConfigLocation</param-name>
20-
<param-value>org.baeldung.spring</param-value>
21-
</context-param>
22-
23-
<listener>
24-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
25-
</listener>
26-
27-
<!-- Spring child -->
28-
<servlet>
29-
<servlet-name>mvc</servlet-name>
30-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
31-
<load-on-startup>1</load-on-startup>
32-
</servlet>
33-
<servlet-mapping>
34-
<servlet-name>mvc</servlet-name>
35-
<url-pattern>/</url-pattern>
36-
</servlet-mapping>
37-
38-
<!-- Spring Security -->
39-
<filter>
40-
<filter-name>springSecurityFilterChain</filter-name>
41-
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
42-
</filter>
43-
<filter-mapping>
44-
<filter-name>springSecurityFilterChain</filter-name>
45-
<url-pattern>/*</url-pattern>
46-
</filter-mapping>
47-
48-
<welcome-file-list>
49-
<welcome-file>index.html</welcome-file>
50-
</welcome-file-list>
51-
9+
</context-param>
10+
<context-param>
11+
<param-name>contextConfigLocation</param-name>
12+
<param-value>org.baeldung.spring</param-value>
13+
</context-param>
14+
<listener>
15+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
16+
</listener>
17+
<servlet>
18+
<servlet-name>mvc</servlet-name>
19+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
20+
<load-on-startup>1</load-on-startup>
21+
</servlet>
22+
<servlet-mapping>
23+
<servlet-name>mvc</servlet-name>
24+
<url-pattern>/</url-pattern>
25+
</servlet-mapping>
26+
<filter>
27+
<filter-name>springSecurityFilterChain</filter-name>
28+
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
29+
</filter>
30+
<filter-mapping>
31+
<filter-name>springSecurityFilterChain</filter-name>
32+
<url-pattern>/*</url-pattern>
33+
</filter-mapping>
34+
<welcome-file-list>
35+
<welcome-file>index.html</welcome-file>
36+
</welcome-file-list>
5237
</web-app>

‎spring-security-rest-basic-auth/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,46 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
3-
<display-name>Spring Security Custom Application</display-name>
4-
<context-param>
5-
<param-name>contextClass</param-name>
6-
<param-value>
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
4+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
5+
id="WebApp_ID" version="3.0">
6+
7+
<display-name>Spring Security Custom Application</display-name>
8+
9+
<!-- Spring root -->
10+
<context-param>
11+
<param-name>contextClass</param-name>
12+
<param-value>
713
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
814
</param-value>
9-
</context-param>
10-
<context-param>
11-
<param-name>contextConfigLocation</param-name>
12-
<param-value>org.baeldung.spring</param-value>
13-
</context-param>
14-
<listener>
15-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
16-
</listener>
17-
<servlet>
18-
<servlet-name>api</servlet-name>
19-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
20-
<load-on-startup>1</load-on-startup>
21-
</servlet>
22-
<servlet-mapping>
23-
<servlet-name>api</servlet-name>
24-
<url-pattern>/api/*</url-pattern>
25-
</servlet-mapping>
26-
<filter>
27-
<filter-name>springSecurityFilterChain</filter-name>
28-
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
29-
</filter>
30-
<filter-mapping>
31-
<filter-name>springSecurityFilterChain</filter-name>
32-
<url-pattern>/*</url-pattern>
33-
</filter-mapping>
15+
</context-param>
16+
<context-param>
17+
<param-name>contextConfigLocation</param-name>
18+
<param-value>org.baeldung.spring</param-value>
19+
</context-param>
20+
21+
<listener>
22+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
23+
</listener>
24+
25+
<!-- Spring child -->
26+
<servlet>
27+
<servlet-name>api</servlet-name>
28+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
29+
<load-on-startup>1</load-on-startup>
30+
</servlet>
31+
<servlet-mapping>
32+
<servlet-name>api</servlet-name>
33+
<url-pattern>/api/*</url-pattern>
34+
</servlet-mapping>
35+
36+
<!-- Spring Security -->
37+
<filter>
38+
<filter-name>springSecurityFilterChain</filter-name>
39+
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
40+
</filter>
41+
<filter-mapping>
42+
<filter-name>springSecurityFilterChain</filter-name>
43+
<url-pattern>/*</url-pattern>
44+
</filter-mapping>
45+
3446
</web-app>

0 commit comments

Comments
 (0)