diff --git a/infra/jpa/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml b/infra/jpa/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml index f457596c..b05f7f18 100644 --- a/infra/jpa/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml +++ b/infra/jpa/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml @@ -1,14 +1,17 @@ + http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd + "> - + @@ -16,9 +19,8 @@ - + diff --git a/infra/mybatis3/projectName-domain/src/main/resources/META-INF/mybatis/mybatis-config.xml b/infra/mybatis3/projectName-domain/src/main/resources/META-INF/mybatis/mybatis-config.xml index 5750237d..8caf7967 100644 --- a/infra/mybatis3/projectName-domain/src/main/resources/META-INF/mybatis/mybatis-config.xml +++ b/infra/mybatis3/projectName-domain/src/main/resources/META-INF/mybatis/mybatis-config.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Config 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-config.dtd"> diff --git a/infra/mybatis3/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml b/infra/mybatis3/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml index b30323dc..bfc3daff 100644 --- a/infra/mybatis3/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml +++ b/infra/mybatis3/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml @@ -1,12 +1,11 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd + "> diff --git a/infra/mybatis3/projectName-domain/src/main/resources/xxxxxx/yyyyyy/zzzzzz/domain/repository/sample/SampleRepository.xml b/infra/mybatis3/projectName-domain/src/main/resources/xxxxxx/yyyyyy/zzzzzz/domain/repository/sample/SampleRepository.xml index c0dba0fa..952b805c 100644 --- a/infra/mybatis3/projectName-domain/src/main/resources/xxxxxx/yyyyyy/zzzzzz/domain/repository/sample/SampleRepository.xml +++ b/infra/mybatis3/projectName-domain/src/main/resources/xxxxxx/yyyyyy/zzzzzz/domain/repository/sample/SampleRepository.xml @@ -1,6 +1,7 @@ - + diff --git a/projectName-domain/src/main/resources/META-INF/spring/projectName-codelist.xml b/projectName-domain/src/main/resources/META-INF/spring/projectName-codelist.xml index e57e4ce1..5f83003f 100644 --- a/projectName-domain/src/main/resources/META-INF/spring/projectName-codelist.xml +++ b/projectName-domain/src/main/resources/META-INF/spring/projectName-codelist.xml @@ -1,7 +1,9 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + "> diff --git a/projectName-domain/src/main/resources/META-INF/spring/projectName-domain.xml b/projectName-domain/src/main/resources/META-INF/spring/projectName-domain.xml index 8ab6b9b2..e1928bfc 100644 --- a/projectName-domain/src/main/resources/META-INF/spring/projectName-domain.xml +++ b/projectName-domain/src/main/resources/META-INF/spring/projectName-domain.xml @@ -4,10 +4,12 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + xsi:schemaLocation=" + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + "> diff --git a/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml b/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml index 23720ba1..1e101c54 100644 --- a/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml +++ b/projectName-domain/src/main/resources/META-INF/spring/projectName-infra.xml @@ -1,10 +1,9 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + "> diff --git a/projectName-domain/src/test/resources/test-context.xml b/projectName-domain/src/test/resources/test-context.xml index d4d74a6d..263d2cf4 100644 --- a/projectName-domain/src/test/resources/test-context.xml +++ b/projectName-domain/src/test/resources/test-context.xml @@ -1,11 +1,11 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + "> @@ -14,7 +14,7 @@ - + diff --git a/projectName-env/src/main/resources/META-INF/spring/projectName-env.xml b/projectName-env/src/main/resources/META-INF/spring/projectName-env.xml index 5e5004dc..cdede4c0 100644 --- a/projectName-env/src/main/resources/META-INF/spring/projectName-env.xml +++ b/projectName-env/src/main/resources/META-INF/spring/projectName-env.xml @@ -1,10 +1,11 @@ + xsi:schemaLocation=" + http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + "> diff --git a/projectName-selenium/src/test/resources/META-INF/spring/seleniumContext.xml b/projectName-selenium/src/test/resources/META-INF/spring/seleniumContext.xml index 419295be..2e4bf335 100644 --- a/projectName-selenium/src/test/resources/META-INF/spring/seleniumContext.xml +++ b/projectName-selenium/src/test/resources/META-INF/spring/seleniumContext.xml @@ -1,15 +1,16 @@ + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + "> - diff --git a/projectName-web/src/main/resources/META-INF/spring/applicationContext.xml b/projectName-web/src/main/resources/META-INF/spring/applicationContext.xml index 355a1af3..08ccd3ac 100644 --- a/projectName-web/src/main/resources/META-INF/spring/applicationContext.xml +++ b/projectName-web/src/main/resources/META-INF/spring/applicationContext.xml @@ -1,10 +1,11 @@ + "> @@ -13,7 +14,7 @@ - + diff --git a/projectName-web/src/main/resources/META-INF/spring/spring-mvc.xml b/projectName-web/src/main/resources/META-INF/spring/spring-mvc.xml index 0fed429c..51e8d2e0 100644 --- a/projectName-web/src/main/resources/META-INF/spring/spring-mvc.xml +++ b/projectName-web/src/main/resources/META-INF/spring/spring-mvc.xml @@ -1,13 +1,16 @@ + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd + "> @@ -88,7 +91,8 @@ - + diff --git a/projectName-web/src/main/resources/META-INF/spring/spring-security.xml b/projectName-web/src/main/resources/META-INF/spring/spring-security.xml index 159288b1..60576be9 100644 --- a/projectName-web/src/main/resources/META-INF/spring/spring-security.xml +++ b/projectName-web/src/main/resources/META-INF/spring/spring-security.xml @@ -1,10 +1,11 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:sec="http://www.springframework.org/schema/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + "> @@ -20,7 +21,8 @@ - + + + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> diff --git a/projectName-web/src/main/webapp/WEB-INF/web.xml b/projectName-web/src/main/webapp/WEB-INF/web.xml index 98b0385c..3554ccb1 100644 --- a/projectName-web/src/main/webapp/WEB-INF/web.xml +++ b/projectName-web/src/main/webapp/WEB-INF/web.xml @@ -1,13 +1,12 @@ - + org.springframework.web.context.ContextLoaderListener - - org.terasoluna.gfw.web.logging.HttpSessionEventLoggingListener - contextConfigLocation @@ -17,6 +16,10 @@ + + org.terasoluna.gfw.web.logging.HttpSessionEventLoggingListener + + MDCClearFilter org.terasoluna.gfw.web.logging.mdc.MDCClearFilter @@ -65,7 +68,6 @@ springSecurityFilterChain org.springframework.web.filter.DelegatingFilterProxy - springSecurityFilterChain /* @@ -81,7 +83,6 @@ 1 - appServlet / @@ -101,10 +102,12 @@ 500 /WEB-INF/views/common/error/systemError.jsp + 404 /WEB-INF/views/common/error/resourceNotFoundError.jsp + java.lang.Exception /WEB-INF/views/common/error/unhandledSystemError.html