Update version of xsd schemas (merged)

diff --git a/servers/commons/src/test/resources/root-context.xml b/servers/commons/src/test/resources/root-context.xml
index 9f670ab..967c277 100644 (file)
--- a/servers/commons/src/test/resources/root-context.xml
+++ b/servers/commons/src/test/resources/root-context.xml
@@ -1,13 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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.2.xsd
-       http://www.springframework.org/schema/mvc       
-       http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+       http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="spring-database.xml"/>
 

diff --git a/servers/commons/src/test/resources/spring-database.xml b/servers/commons/src/test/resources/spring-database.xml
index 185c470..436822f 100644 (file)
--- a/servers/commons/src/test/resources/spring-database.xml
+++ b/servers/commons/src/test/resources/spring-database.xml
@@ -3,9 +3,9 @@
        xmlns:jpa="http://www.springframework.org/schema/data/jpa"
        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-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
 
 
     <tx:annotation-driven transaction-manager="transactionManager" />

diff --git a/servers/commons/src/test/resources/spring-security.xml b/servers/commons/src/test/resources/spring-security.xml
index a75c61c..a7b471f 100644 (file)
--- a/servers/commons/src/test/resources/spring-security.xml
+++ b/servers/commons/src/test/resources/spring-security.xml
@@ -3,7 +3,7 @@
        xmlns:security="http://www.springframework.org/schema/security"
        xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                                               http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+                                               http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
                                                http://www.springframework.org/schema/security
                                                http://www.springframework.org/schema/security/spring-security-3.2.xsd
                                                http://www.springframework.org/schema/security/oauth2

diff --git a/servers/dsm/src/main/resources/apache-tiles.xml b/servers/dsm/src/main/resources/apache-tiles.xml
index f796fc6..d90249e 100644 (file)
--- a/servers/dsm/src/main/resources/apache-tiles.xml
+++ b/servers/dsm/src/main/resources/apache-tiles.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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-3.2.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
 
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix" value="/WEB-INF/views/" />

diff --git a/servers/dsm/src/main/resources/root-context.xml b/servers/dsm/src/main/resources/root-context.xml
index dc7ed37..7db9034 100644 (file)
--- a/servers/dsm/src/main/resources/root-context.xml
+++ b/servers/dsm/src/main/resources/root-context.xml
@@ -2,9 +2,9 @@
        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-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+       http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="spring-database.xml" />
     <import resource="spring-security.xml" />

diff --git a/servers/dsm/src/main/resources/servlet-context.xml b/servers/dsm/src/main/resources/servlet-context.xml
index a983688..9c0e862 100644 (file)
--- a/servers/dsm/src/main/resources/servlet-context.xml
+++ b/servers/dsm/src/main/resources/servlet-context.xml
@@ -3,11 +3,11 @@
        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.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/mvc       
        http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
        http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+       http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="apache-tiles.xml" />
     <context:component-scan base-package="com.samsung" />

diff --git a/servers/dsm/src/main/resources/spring-database.xml b/servers/dsm/src/main/resources/spring-database.xml
index 0d2fc6f..a166426 100644 (file)
--- a/servers/dsm/src/main/resources/spring-database.xml
+++ b/servers/dsm/src/main/resources/spring-database.xml
@@ -3,11 +3,11 @@
        xmlns:tx="http://www.springframework.org/schema/tx"
        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-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/data/jpa
        http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd
        http://www.springframework.org/schema/tx
-       http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+       http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
 
     <tx:annotation-driven transaction-manager="transactionManager"/>
 

diff --git a/servers/dsm/src/main/resources/spring-security.xml b/servers/dsm/src/main/resources/spring-security.xml
index 8fc473e..cc5ca34 100644 (file)
--- a/servers/dsm/src/main/resources/spring-security.xml
+++ b/servers/dsm/src/main/resources/spring-security.xml
@@ -3,7 +3,7 @@
        xmlns:security="http://www.springframework.org/schema/security"
        xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                                               http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+                                               http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
                                                http://www.springframework.org/schema/security
                                                http://www.springframework.org/schema/security/spring-security-3.2.xsd
                                                http://www.springframework.org/schema/security/oauth2

diff --git a/servers/dsm/src/test/resources/root-context.xml b/servers/dsm/src/test/resources/root-context.xml
index 663bbec..57fbb20 100644 (file)
--- a/servers/dsm/src/test/resources/root-context.xml
+++ b/servers/dsm/src/test/resources/root-context.xml
@@ -3,11 +3,11 @@
        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.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/mvc       
        http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
        http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.2.xsd">
+       http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="spring-database.xml"/>
     <import resource="spring-security.xml"/>

diff --git a/servers/mq/src/main/resources/iotivity.xml b/servers/mq/src/main/resources/iotivity.xml
index ebedd59..333df31 100644 (file)
--- a/servers/mq/src/main/resources/iotivity.xml
+++ b/servers/mq/src/main/resources/iotivity.xml
@@ -1,8 +1,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-       http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+                           http://www.springframework.org/schema/task
+                           http://www.springframework.org/schema/task/spring-task-4.3.xsd">
 
     <bean id="reportExtractor"
         class="com.samsung.servermq.iotivity.extractor.impl.ReportPostDataExtractor" />

diff --git a/servers/mq/src/main/resources/spring-database.xml b/servers/mq/src/main/resources/spring-database.xml
index 80ea4a9..363e690 100644 (file)
--- a/servers/mq/src/main/resources/spring-database.xml
+++ b/servers/mq/src/main/resources/spring-database.xml
@@ -2,11 +2,11 @@
     xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:tx="http://www.springframework.org/schema/tx"
     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-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/data/jpa
        http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd
        http://www.springframework.org/schema/tx
-       http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+       http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
 
     <tx:annotation-driven transaction-manager="transactionManager" />
 

diff --git a/servers/mq/src/test/resources/iotivity.xml b/servers/mq/src/test/resources/iotivity.xml
index 4b9f080..3697333 100644 (file)
--- a/servers/mq/src/test/resources/iotivity.xml
+++ b/servers/mq/src/test/resources/iotivity.xml
@@ -1,7 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd">
 
 <bean id="reportExtractor"

diff --git a/servers/mq/src/test/resources/spring-database.xml b/servers/mq/src/test/resources/spring-database.xml
index 22c56c1..25382d5 100644 (file)
--- a/servers/mq/src/test/resources/spring-database.xml
+++ b/servers/mq/src/test/resources/spring-database.xml
@@ -3,12 +3,13 @@
        xmlns:jpa="http://www.springframework.org/schema/data/jpa"
        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-3.2.xsd
+       http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
 
 
     <tx:annotation-driven transaction-manager="transactionManager" />
+
     <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
         <property name="entityManagerFactory" ref="emf" />
     </bean>
@@ -28,7 +29,7 @@
 
     <bean id="emf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="dataSource" />
-        <property name="packagesToScan" value="com.samsung, com.samsung.dsm.domain" />
+        <property name="packagesToScan" value="com.samsung" />
         <property name="jpaVendorAdapter">
             <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
         </property>