Skip to content

Commit 105ccb0

Browse files
author
eugenp
committed
clarification on the mvc vs rest projects
1 parent de47671 commit 105ccb0

10 files changed

Lines changed: 12 additions & 97 deletions

File tree

spring-security-basic-auth/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@
66
### Relevant Article:
77
- [Spring Security - security none, filters none, access permitAll](http://www.baeldung.com/security-none-filters-none-access-permitAll)
88
- [Spring Security Basic Authentication](http://www.baeldung.com/spring-security-basic-authentication)
9+
10+
11+
### Notes
12+
- the project includes both views as well as a REST layer

spring-security-custom/.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-custom</name>
3+
<name>spring-security-rest-custom</name>
44
<comment></comment>
55
<projects>
66
</projects>
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-custom">
2+
<wb-module deploy-name="spring-security-rest-custom">
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-custom"/>
8-
<property name="java-output-path" value="/spring-security-custom/target/classes"/>
7+
<property name="context-root" value="spring-security-rest-custom"/>
8+
<property name="java-output-path" value="/spring-security-rest-custom/target/classes"/>
99
</wb-module>
1010
</project-modules>

spring-security-custom/.springBeans

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beansProjectDescription>
33
<version>1</version>
4-
<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
4+
<pluginVersion><![CDATA[3.3.0.201307091516-RELEASE]]></pluginVersion>
55
<configSuffixes>
66
<configSuffix><![CDATA[xml]]></configSuffix>
77
</configSuffixes>

spring-security-custom/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.baeldung</groupId>
5-
<artifactId>spring-security-custom</artifactId>
5+
<artifactId>spring-security-rest-custom</artifactId>
66
<version>0.1-SNAPSHOT</version>
77

8-
<name>spring-security-custom</name>
8+
<name>spring-security-rest-custom</name>
99
<packaging>war</packaging>
1010

1111
<dependencies>
@@ -142,7 +142,7 @@
142142
</dependencies>
143143

144144
<build>
145-
<finalName>spring-security-custom</finalName>
145+
<finalName>spring-security-rest-custom</finalName>
146146
<resources>
147147
<resource>
148148
<directory>src/main/resources</directory>

spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java

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

spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml

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

spring-security-custom/src/main/webapp/WEB-INF/view/homepage.jsp

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

spring-security-custom/src/main/webapp/WEB-INF/view/login.jsp

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

spring-security-custom/src/main/webapp/WEB-INF/web.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
<url-pattern>/api/*</url-pattern>
3434
</servlet-mapping>
3535

36-
<servlet>
37-
<servlet-name>mvc</servlet-name>
38-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
39-
<load-on-startup>1</load-on-startup>
40-
</servlet>
41-
<servlet-mapping>
42-
<servlet-name>mvc</servlet-name>
43-
<url-pattern>/*</url-pattern>
44-
</servlet-mapping>
4536

4637
<!-- Spring Security -->
4738
<filter>

0 commit comments

Comments
 (0)