From 24359059937827c31d057c9840426c0be9fc15e7 Mon Sep 17 00:00:00 2001 From: Clarence Ho Date: Sun, 1 Nov 2015 15:43:09 +0800 Subject: [PATCH] Changes for latest STS version --- .classpath | 13 +- .gitignore | 3 +- .settings/org.eclipse.jdt.core.prefs | 7 +- ...se.wst.common.project.facet.core.prefs.xml | 12 - ....eclipse.wst.common.project.facet.core.xml | 7 +- ...pring-instrument-tomcat-3.1.0.RELEASE.jar} | Bin 7551 -> 11468 bytes pom.xml | 4 +- src/main/resources/jpa-app-context.xml | 10 +- src/main/webapp/WEB-INF/web.xml | 205 ++++++++---------- 9 files changed, 112 insertions(+), 149 deletions(-) delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.prefs.xml rename lib/{spring-instrument-3.1.0.RELEASE.jar => spring-instrument-tomcat-3.1.0.RELEASE.jar} (50%) diff --git a/.classpath b/.classpath index c99cf86..88de0be 100644 --- a/.classpath +++ b/.classpath @@ -22,15 +22,20 @@ - + + - + - - + + + + + + diff --git a/.gitignore b/.gitignore index 9696edc..f43be95 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ pom.xml.next release.properties dependency-reduced-pom.xml buildNumber.properties -.mvn/timing.properties \ No newline at end of file +.mvn/timing.properties +.DS_Store \ No newline at end of file diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4ead072..672496e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,12 @@ -#Mon Oct 10 10:00:50 CST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml deleted file mode 100644 index 6d59853..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index e4a980e..0ceb967 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,9 +1,8 @@ + - - - - + + diff --git a/lib/spring-instrument-3.1.0.RELEASE.jar b/lib/spring-instrument-tomcat-3.1.0.RELEASE.jar similarity index 50% rename from lib/spring-instrument-3.1.0.RELEASE.jar rename to lib/spring-instrument-tomcat-3.1.0.RELEASE.jar index 6cb91ca308790d069abdffa58322524c63e604c4..9a5a14e4341c58c97acb3c5dbf20d2c5563324fd 100644 GIT binary patch delta 4829 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 WAq5NzSw1cXE{0XW%(7n!BnbeN-Qs5e diff --git a/pom.xml b/pom.xml index 0756093..2d571fa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,9 @@ springblog Apress ProSpring3 SpringBlog Application war - 1.0.0 + 1.1.0 - 1.6 + 1.8 3.1.0.RELEASE 3.1.0.RELEASE 1.0.2.RELEASE diff --git a/src/main/resources/jpa-app-context.xml b/src/main/resources/jpa-app-context.xml index 7539c0a..3604024 100644 --- a/src/main/resources/jpa-app-context.xml +++ b/src/main/resources/jpa-app-context.xml @@ -21,19 +21,21 @@ - + - + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 40e4c7d..1bcfcfb 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,124 +1,93 @@ - - - - - - defaultHtmlEscape - true - - - spring.profiles.active - - jpa,h2 - - - contextConfigLocation - + + + defaultHtmlEscape + true + + + spring.profiles.active + jpa,h2 + + + contextConfigLocation + /WEB-INF/spring/root-context.xml /WEB-INF/spring/datasource.xml /WEB-INF/spring/batch-context.xml /WEB-INF/spring/*-tx-config.xml /WEB-INF/spring/*-service-context.xml - - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - CharacterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - - HttpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - - Spring OpenEntityManagerInViewFilter - org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter - - - - CharacterEncodingFilter - /* - - - - HttpMethodFilter - /* - - - - - Spring OpenEntityManagerInViewFilter - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - - blogAppServlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/spring/blogapp-webmvc-config.xml - - 1 - - 5000000 - - - - - blogAppServlet - / - - - - - restful - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/spring/restful-context.xml - - 1 - - - - restful - /restful/* - - - + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + + + CharacterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + HttpMethodFilter + org.springframework.web.filter.HiddenHttpMethodFilter + + + Spring OpenEntityManagerInViewFilter + org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter + + + CharacterEncodingFilter + /* + + + HttpMethodFilter + /* + + + Spring OpenEntityManagerInViewFilter + /* + + + org.springframework.web.context.ContextLoaderListener + + + blogAppServlet + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/spring/blogapp-webmvc-config.xml + + 1 + + 5000000 + + + + blogAppServlet + / + + + restful + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/spring/restful-context.xml + + 1 + + + restful + /restful/* + + \ No newline at end of file