iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
DOHA
2015-03-27 20:32:50 +02:00
parent 319652bacd bac964fe7f
commit c25378191e
25 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-security-rest-full/.settings/org.eclipse.wst.common.component
-2
View File
@@ -5,8 +5,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<property name="context-root" value="spring-security-rest-full"/>
<property name="java-output-path" value="/spring-security-rest-full/target/classes"/>
</wb-module>
spring-security-rest-full/pom.xml
+2 -2
View File
@@ -414,8 +414,8 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version>
spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java
+1
View File
@@ -25,6 +25,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
viewResolver.setSuffix(".jsp");
return viewResolver;
}
// API
@Override
public void addViewControllers(final ViewControllerRegistry registry) {