Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
112 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
12 changes: 0 additions & 12 deletions
12
.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <faceted-project> | ||
| <runtime name="Apache Tomcat v7.0"/> | ||
| <fixed facet="jst.web"/> | ||
| <fixed facet="jst.java"/> | ||
| <installed facet="jst.web" version="2.5"/> | ||
| <installed facet="jst.java" version="1.6"/> | ||
| <installed facet="jst.jsf" version="2.0"/> | ||
| <installed facet="jst.jaxrs" version="1.1"/> | ||
| <installed facet="jst.java" version="1.8"/> | ||
| <installed facet="jst.web" version="3.0"/> | ||
| </faceted-project> |
Binary file renamed
BIN
+7.37 KB
lib/spring-instrument-3.1.0.RELEASE.jar → ...pring-instrument-tomcat-3.1.0.RELEASE.jar
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> | ||
|
|
||
| <!-- The definition of the Root Spring Container shared by all Servlets and Filters --> | ||
| <!-- Enable escaping of form submission contents --> | ||
| <context-param> | ||
| <param-name>defaultHtmlEscape</param-name> | ||
| <param-value>true</param-value> | ||
| </context-param> | ||
| <context-param> | ||
| <param-name>spring.profiles.active</param-name> | ||
| <!-- Spring profile parameters | ||
| First profile: jpa - JPA implementation | ||
| mybatis - MyBatis implementation | ||
| Second profile: mysql - MySQL DB | ||
| h2 - H2 database | ||
| --> | ||
| <param-value>jpa,h2</param-value> | ||
| </context-param> | ||
| <context-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value> | ||
| <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> | ||
| <context-param> | ||
| <param-name>defaultHtmlEscape</param-name> | ||
| <param-value>true</param-value> | ||
| </context-param> | ||
| <context-param> | ||
| <param-name>spring.profiles.active</param-name> | ||
| <param-value>jpa,h2</param-value> | ||
| </context-param> | ||
| <context-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value> | ||
| /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 | ||
| </param-value> | ||
| </context-param> | ||
|
|
||
| <!-- Spring Security Configuration --> | ||
| <filter> | ||
| <filter-name>springSecurityFilterChain</filter-name> | ||
| <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> | ||
| </filter> | ||
|
|
||
| <filter-mapping> | ||
| <filter-name>springSecurityFilterChain</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
|
|
||
| <filter> | ||
| <filter-name>CharacterEncodingFilter</filter-name> | ||
| <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> | ||
| <init-param> | ||
| <param-name>encoding</param-name> | ||
| <param-value>UTF-8</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <param-name>forceEncoding</param-name> | ||
| <param-value>true</param-value> | ||
| </init-param> | ||
| </filter> | ||
|
|
||
| <filter> | ||
| <filter-name>HttpMethodFilter</filter-name> | ||
| <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class> | ||
| </filter> | ||
|
|
||
| <!-- Need to comment out the following filter for MyBatis --> | ||
| <filter> | ||
| <filter-name>Spring OpenEntityManagerInViewFilter</filter-name> | ||
| <filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class> | ||
| </filter> | ||
|
|
||
| <filter-mapping> | ||
| <filter-name>CharacterEncodingFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
|
|
||
| <filter-mapping> | ||
| <filter-name>HttpMethodFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
|
|
||
| <!-- Need to comment out the following filter for MyBatis --> | ||
| <filter-mapping> | ||
| <filter-name>Spring OpenEntityManagerInViewFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
|
|
||
| <!-- Creates the Spring Container shared by all Servlets and Filters --> | ||
| <listener> | ||
| <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> | ||
| </listener> | ||
|
|
||
| <!-- Spring MVC Dispatcher Servlet for SpringBlog application --> | ||
| <servlet> | ||
| <servlet-name>blogAppServlet</servlet-name> | ||
| <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> | ||
| <init-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value>/WEB-INF/spring/blogapp-webmvc-config.xml</param-value> | ||
| </init-param> | ||
| <load-on-startup>1</load-on-startup> | ||
| <multipart-config> | ||
| <max-file-size>5000000</max-file-size> | ||
| </multipart-config> | ||
| </servlet> | ||
|
|
||
| <servlet-mapping> | ||
| <servlet-name>blogAppServlet</servlet-name> | ||
| <url-pattern>/</url-pattern> | ||
| </servlet-mapping> | ||
|
|
||
| <!-- Spring MVC Dispatcher Servlet for RESTful-WS --> | ||
| <servlet> | ||
| <servlet-name>restful</servlet-name> | ||
| <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> | ||
| <init-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value>/WEB-INF/spring/restful-context.xml</param-value> | ||
| </init-param> | ||
| <load-on-startup>1</load-on-startup> | ||
| </servlet> | ||
|
|
||
| <servlet-mapping> | ||
| <servlet-name>restful</servlet-name> | ||
| <url-pattern>/restful/*</url-pattern> | ||
| </servlet-mapping> | ||
|
|
||
| </web-app> | ||
| </param-value> | ||
| </context-param> | ||
| <filter> | ||
| <filter-name>springSecurityFilterChain</filter-name> | ||
| <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> | ||
| </filter> | ||
| <filter-mapping> | ||
| <filter-name>springSecurityFilterChain</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
| <filter> | ||
| <filter-name>CharacterEncodingFilter</filter-name> | ||
| <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> | ||
| <init-param> | ||
| <param-name>encoding</param-name> | ||
| <param-value>UTF-8</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <param-name>forceEncoding</param-name> | ||
| <param-value>true</param-value> | ||
| </init-param> | ||
| </filter> | ||
| <filter> | ||
| <filter-name>HttpMethodFilter</filter-name> | ||
| <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class> | ||
| </filter> | ||
| <filter> | ||
| <filter-name>Spring OpenEntityManagerInViewFilter</filter-name> | ||
| <filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class> | ||
| </filter> | ||
| <filter-mapping> | ||
| <filter-name>CharacterEncodingFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
| <filter-mapping> | ||
| <filter-name>HttpMethodFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
| <filter-mapping> | ||
| <filter-name>Spring OpenEntityManagerInViewFilter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
| <listener> | ||
| <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> | ||
| </listener> | ||
| <servlet> | ||
| <servlet-name>blogAppServlet</servlet-name> | ||
| <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> | ||
| <init-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value>/WEB-INF/spring/blogapp-webmvc-config.xml</param-value> | ||
| </init-param> | ||
| <load-on-startup>1</load-on-startup> | ||
| <multipart-config> | ||
| <max-file-size>5000000</max-file-size> | ||
| </multipart-config> | ||
| </servlet> | ||
| <servlet-mapping> | ||
| <servlet-name>blogAppServlet</servlet-name> | ||
| <url-pattern>/</url-pattern> | ||
| </servlet-mapping> | ||
| <servlet> | ||
| <servlet-name>restful</servlet-name> | ||
| <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> | ||
| <init-param> | ||
| <param-name>contextConfigLocation</param-name> | ||
| <param-value>/WEB-INF/spring/restful-context.xml</param-value> | ||
| </init-param> | ||
| <load-on-startup>1</load-on-startup> | ||
| </servlet> | ||
| <servlet-mapping> | ||
| <servlet-name>restful</servlet-name> | ||
| <url-pattern>/restful/*</url-pattern> | ||
| </servlet-mapping> | ||
| </web-app> |