diff --git a/model/pom.xml b/model/pom.xml index de096eb..686ef99 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.expt.blog diff --git a/mvc/pom.xml b/mvc/pom.xml index 6c3580a..23f1fbe 100644 --- a/mvc/pom.xml +++ b/mvc/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.expt.blog diff --git a/pom.xml b/pom.xml index a408706..1f50140 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.expt.blog @@ -15,10 +16,10 @@ - webapp - mvc - service - model + webapp + mvc + service + model @@ -74,7 +75,9 @@ package - copy + + copy + diff --git a/service/pom.xml b/service/pom.xml index e14aec9..9b0deea 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.expt.blog diff --git a/webapp/pom.xml b/webapp/pom.xml index e56177e..c4be0b7 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.expt.blog diff --git a/webapp/src/main/webapp/WEB-INF/layouts/templates.xml b/webapp/src/main/webapp/WEB-INF/layouts/templates.xml index 97a326f..4235254 100644 --- a/webapp/src/main/webapp/WEB-INF/layouts/templates.xml +++ b/webapp/src/main/webapp/WEB-INF/layouts/templates.xml @@ -1,7 +1,5 @@ - + diff --git a/webapp/src/main/webapp/WEB-INF/spring/app-config.xml b/webapp/src/main/webapp/WEB-INF/spring/app-config.xml index 756e01a..bd0a503 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/app-config.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/app-config.xml @@ -2,16 +2,14 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + diff --git a/webapp/src/main/webapp/WEB-INF/spring/data-config.xml b/webapp/src/main/webapp/WEB-INF/spring/data-config.xml index 649579d..961884d 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/data-config.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/data-config.xml @@ -1,46 +1,43 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:p="http://www.springframework.org/schema/p" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:jpa="http://www.springframework.org/schema/data/jpa" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd + http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"> - + - + - + - - - - + + + + - - - + + + diff --git a/webapp/src/main/webapp/WEB-INF/spring/locale-config.xml b/webapp/src/main/webapp/WEB-INF/spring/locale-config.xml index 04d6b1f..c46424b 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/locale-config.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/locale-config.xml @@ -3,32 +3,29 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - - - - + + + + - + - + - + - - + + diff --git a/webapp/src/main/webapp/WEB-INF/spring/mvc-config.xml b/webapp/src/main/webapp/WEB-INF/spring/mvc-config.xml index 58288e7..ec7ec47 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/mvc-config.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/mvc-config.xml @@ -4,12 +4,9 @@ xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd"> @@ -40,7 +37,8 @@ - + diff --git a/webapp/src/main/webapp/WEB-INF/spring/user/expt-blog-config.xml b/webapp/src/main/webapp/WEB-INF/spring/user/expt-blog-config.xml index 8321b07..7e3d54d 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/user/expt-blog-config.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/user/expt-blog-config.xml @@ -2,10 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 52602c4..21a6a1c 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,6 @@ - expt-blog