MODE-2613: Modeshape persistence test module

Author: okulikov

Diff for: connectors/modeshape-connector-jdbc-metadata/src/test/resources/config/repo-config-jdbc-meta-federation.json

@@ -8,12 +8,12 @@
         "jdbc-meta" : {
             "classname" : "org.modeshape.connector.meta.jdbc.JdbcMetadataConnector",
             "dataSourceJndiName" : "java:/testDS",
-            "maximumConnectionsInPool" : "${dataSource.maximumConnectionsInPool}",
-            "minimumConnectionsInPool" : "${dataSource.minimumConnectionsInPool}",
-            "maximumConnectionIdleTimeInSeconds" : "${dataSource.maximumConnectionIdleTimeInSeconds}",
-            "maximumSizeOfStatementCache" : "${dataSource.maximumSizeOfStatementCache}",
-            "numberOfConnectionsToAcquireAsNeeded" : "${dataSource.numberOfConnectionsToAcquireAsNeeded}",
-            "retryLimit" : "${dataSource.retryLimit}"
+            "maximumConnectionsInPool" : "${database.maximumConnectionsInPool}",
+            "minimumConnectionsInPool" : "${database.minimumConnectionsInPool}",
+            "maximumConnectionIdleTimeInSeconds" : "${database.maximumConnectionIdleTimeInSeconds}",
+            "maximumSizeOfStatementCache" : "${database.maximumSizeOfStatementCache}",
+            "numberOfConnectionsToAcquireAsNeeded" : "${database.numberOfConnectionsToAcquireAsNeeded}",
+            "retryLimit" : "${database.retryLimit}"
         }
     }
 }

Diff for: modeshape-jcr/src/test/resources/config/db/datasource.properties

@@ -1,14 +1,14 @@
 # Property file which will be filtered based on the properties from the db profiles (main pom)
 database = ${database}
 
-driverClassName=${dataSource.driverClassName}
-url=${dataSource.url}
-username=${dataSource.username}
-password=${dataSource.password}
+driverClassName=${database.driver}
+url=${database.url}
+username=${database.username}
+password=${database.password}
 
-maximumConnectionsInPool = ${dataSource.maximumConnectionsInPool}
-minimumConnectionsInPool = ${dataSource.minimumConnectionsInPool}
-maximumSizeOfStatementCache = ${dataSource.maximumSizeOfStatementCache}
-maximumConnectionIdleTimeInSeconds = ${dataSource.maximumConnectionIdleTimeInSeconds}
-numberOfConnectionsToAcquireAsNeeded = ${dataSource.numberOfConnectionsToAcquireAsNeeded}
-retryLimit = ${dataSource.retryLimit}
+maximumConnectionsInPool = ${database.maximumConnectionsInPool}
+minimumConnectionsInPool = ${database.minimumConnectionsInPool}
+maximumSizeOfStatementCache = ${database.maximumSizeOfStatementCache}
+maximumConnectionIdleTimeInSeconds = ${database.maximumConnectionIdleTimeInSeconds}
+numberOfConnectionsToAcquireAsNeeded = ${database.numberOfConnectionsToAcquireAsNeeded}
+retryLimit = ${database.retryLimit}

Diff for: modeshape-jcr/src/test/resources/config/db/repo-config-jdbc.json

@@ -3,19 +3,19 @@
     "storage" : {
         "persistence" : {
             "type" : "db",
-            "connectionUrl": "${dataSource.url}",
-            "driver": "${dataSource.driverClassName}",
-            "username": "${dataSource.username}",
-            "password": "${dataSource.password}",
+            "connectionUrl": "${database.url}",
+            "driver": "${database.driver}",
+            "username": "${database.username}",
+            "password": "${database.password}",
             "createOnStart": true,
             "dropOnExit": false
         },
         "binaryStorage" : {
             "type"  : "database",
-            "driverClass" : "${dataSource.driverClassName}",
-            "url" : "${dataSource.url}",
-            "username" : "${dataSource.username}",
-            "password" : "${dataSource.password}"
+            "driverClass" : "${database.driver}",
+            "url" : "${database.url}",
+            "username" : "${database.username}",
+            "password" : "${database.password}"
         }
     },
     "workspaces" : {