Renaming data source names

features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml

@@ -19,7 +19,7 @@
     <ManagementRepository>
         <DataSourceConfiguration>
             <JndiLookupDefinition>
-                <Name>jdbc/MOBILE_MGT_DS</Name>
+                <Name>jdbc/MobileDM_DS</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
     </ManagementRepository>
@@ -28,7 +28,7 @@
 	<APIs>
 	    <API>
 	       <Name>enrollment</Name>
-	       <Provider>admin</Provider>
+	       <Owner>admin</Owner>
 	       <Context>enrollment</Context>
 	       <Version>1.0.0</Version>
 	       <Endpoint>http://localhost:9763/</Endpoint>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml

@@ -18,7 +18,7 @@
     <ManagementRepository>
         <DataSourceConfiguration>
             <JndiLookupDefinition>
-                <Name>jdbc/DEVICE_MGT_DS</Name>
+                <Name>jdbc/DM_DS</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
     </ManagementRepository>

product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml

@@ -5,14 +5,14 @@
 
     <datasources>
         <datasource>
-            <name>DEVICE_MGT_DS</name>
+            <name>DM_DS</name>
             <description>The datasource used for CDM</description>
             <jndiConfig>
-                <name>jdbc/DEVICE_MGT_DS</name>
+                <name>jdbc/DM_DS</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DEVICEMGT_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
@@ -25,14 +25,14 @@
             </definition>
         </datasource>
         <datasource>
-            <name>MOBILE_MGT_DS</name>
+            <name>MobileDM_DS</name>
             <description>The datasource used for CDM Mobile Device Management</description>
             <jndiConfig>
-                <name>jdbc/MOBILE_MGT_DS</name>
+                <name>jdbc/MobileDM_DS</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2MOBILE_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2MobileDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
@@ -45,7 +45,7 @@
             </definition>
         </datasource>
 	<datasource>
-            <name>WSO2DEVICE_DB</name>
+            <name>WSO2AM_DS</name>
             <description>The datasource used for CDM</description>
             <jndiConfig>
                 <name>jdbc/WSO2AM_DB</name>