Permalink
Browse files

Reverting the changes due to not upgrading to JDK 1.6 at the moment.

  • Loading branch information...
Vladislav Gangan
Vladislav Gangan committed May 28, 2012
1 parent 593f82c commit 1806aac10d1709d19987cca4f62cabac79a6f61c
@@ -2,35 +2,35 @@ distributed-sample.context=orchestrator
distributed-sample.controlled.systems=app1,app2,app3
orchestrator.jdbc.database.type=hsqldb
-orchestrator.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orchestrator.jdbc.driver=org.hsqldb.jdbcDriver
orchestrator.jdbc.url=jdbc:hsqldb:file:./var/orchestrator
orchestrator.jdbc.username=sa
orchestrator.jdbc.password=
orchestrator.patch.path=orchestrator:example.orchestrator.db.patch
app1.jdbc.database.type=hsqldb
-app1.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+app1.jdbc.driver=org.hsqldb.jdbcDriver
app1.jdbc.url=jdbc:hsqldb:file:./var/app1
app1.jdbc.username=sa
app1.jdbc.password=
app1.patch.path=app1:example.app1.db.patch
app2.jdbc.database.type=hsqldb
-app2.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+app2.jdbc.driver=org.hsqldb.jdbcDriver
app2.jdbc.url=jdbc:hsqldb:file:./var/app2
app2.jdbc.username=sa
app2.jdbc.password=
app2.patch.path=app2:example.app2.db.patch
app3.jdbc.systems=jdbc-system1,jdbc-system2
app3.jdbc-system1.database.type=hsqldb
-app3.jdbc-system1.driver=org.hsqldb.jdbc.JDBCDriver
+app3.jdbc-system1.driver=org.hsqldb.jdbcDriver
app3.jdbc-system1.url=jdbc:hsqldb:file:./var/app3/system1
app3.jdbc-system1.username=sa
app3.jdbc-system1.password=
app3.jdbc-system2.database.type=hsqldb
-app3.jdbc-system2.driver=org.hsqldb.jdbc.JDBCDriver
+app3.jdbc-system2.driver=org.hsqldb.jdbcDriver
app3.jdbc-system2.url=jdbc:hsqldb:file:./var/app3/system2
app3.jdbc-system2.username=sa
app3.jdbc-system2.password=
View
@@ -387,9 +387,9 @@
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
+ <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.4</version>
+ <version>1.8.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -8,7 +8,7 @@ integration_test.listeners=com.tacitknowledge.util.migration.listeners.WhinyMigr
# Configure a context named "core"
#
core.jdbc.database.type=hsqldb
-core.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+core.jdbc.driver=org.hsqldb.jdbcDriver
core.jdbc.url=jdbc:hsqldb:mem:core
core.jdbc.username=sa
core.jdbc.password=
@@ -17,7 +17,7 @@ core.patch.path=com.tacitknowledge.util.migration.inttest-tasks.core
# Configure a context named "orders"
#
orders.jdbc.database.type=hsqldb
-orders.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orders.jdbc.driver=org.hsqldb.jdbcDriver
orders.jdbc.url=jdbc:hsqldb:mem:orders
orders.jdbc.username=sa
orders.jdbc.password=
@@ -28,17 +28,17 @@ orders.patch.path=com.tacitknowledge.util.migration.inttest-tasks.order
#
catalog.jdbc.systems=jdbccatalog1,jdbccatalog2,jdbccatalog3
catalog.jdbccatalog1.database.type=hsqldb
-catalog.jdbccatalog1.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog1.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog1.url=jdbc:hsqldb:mem:catalog1
catalog.jdbccatalog1.username=sa
catalog.jdbccatalog1.password=
catalog.jdbccatalog2.database.type=hsqldb
-catalog.jdbccatalog2.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog2.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog2.url=jdbc:hsqldb:mem:catalog2
catalog.jdbccatalog2.username=sa
catalog.jdbccatalog2.password=
catalog.jdbccatalog3.database.type=hsqldb
-catalog.jdbccatalog3.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog3.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog3.url=jdbc:hsqldb:mem:catalog3
catalog.jdbccatalog3.username=sa
catalog.jdbccatalog3.password=
@@ -7,7 +7,7 @@ migration.strategy=com.tacitknowledge.util.migration.MissingPatchMigrationRunner
# Configure a context named "orders"
#
orders.jdbc.database.type=hsqldb
-orders.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orders.jdbc.driver=org.hsqldb.jdbcDriver
orders.jdbc.url=jdbc:hsqldb:mem:orders
orders.jdbc.username=sa
orders.jdbc.password=
@@ -19,20 +19,20 @@ orders.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchst
nodes.context=nodes
nodes.controlled.systems=nodes
nodes.jdbc.database.type=hsqldb
-nodes.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbc.driver=org.hsqldb.jdbcDriver
nodes.jdbc.url=jdbc:hsqldb:mem:nodes
nodes.jdbc.username=sa
nodes.jdbc.password=
nodes.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchstrategy.batch1
nodes.jdbc.systems=jdbcnode1,jdbcnode2
nodes.jdbcnode1.database.type=hsqldb
-nodes.jdbcnode1.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode1.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode1.url=jdbc:hsqldb:mem:node1
nodes.jdbcnode1.username=sa
nodes.jdbcnode1.password=
nodes.jdbcnode2.database.type=hsqldb
-nodes.jdbcnode2.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode2.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode2.url=jdbc:hsqldb:mem:node2
nodes.jdbcnode2.username=sa
nodes.jdbcnode2.password=
@@ -7,7 +7,7 @@ migration.strategy=com.tacitknowledge.util.migration.MissingPatchMigrationRunner
# Configure a context named "orders"
#
orders.jdbc.database.type=hsqldb
-orders.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orders.jdbc.driver=org.hsqldb.jdbcDriver
orders.jdbc.url=jdbc:hsqldb:mem:orders
orders.jdbc.username=sa
orders.jdbc.password=
@@ -19,20 +19,20 @@ orders.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchst
nodes.context=nodes
nodes.controlled.systems=nodes
nodes.jdbc.database.type=hsqldb
-nodes.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbc.driver=org.hsqldb.jdbcDriver
nodes.jdbc.url=jdbc:hsqldb:mem:nodes
nodes.jdbc.username=sa
nodes.jdbc.password=
nodes.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchstrategy.batch2
nodes.jdbc.systems=jdbcnode1,jdbcnode2
nodes.jdbcnode1.database.type=hsqldb
-nodes.jdbcnode1.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode1.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode1.url=jdbc:hsqldb:mem:node1
nodes.jdbcnode1.username=sa
nodes.jdbcnode1.password=
nodes.jdbcnode2.database.type=hsqldb
-nodes.jdbcnode2.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode2.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode2.url=jdbc:hsqldb:mem:node2
nodes.jdbcnode2.username=sa
nodes.jdbcnode2.password=
@@ -10,15 +10,15 @@ migration.strategy=com.tacitknowledge.util.migration.MissingPatchMigrationRunner
nodes.context=nodes
nodes.controlled.systems=nodes
nodes.jdbc.database.type=hsqldb
-nodes.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbc.driver=org.hsqldb.jdbcDriver
nodes.jdbc.url=jdbc:hsqldb:mem:nodes
nodes.jdbc.username=sa
nodes.jdbc.password=
nodes.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchstrategy.batch1
nodes.jdbc.systems=jdbcnode3
nodes.jdbcnode3.database.type=hsqldb
-nodes.jdbcnode3.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode3.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode3.url=jdbc:hsqldb:mem:node3
nodes.jdbcnode3.username=sa
nodes.jdbcnode3.password=
@@ -9,25 +9,25 @@ migration.strategy=com.tacitknowledge.util.migration.MissingPatchMigrationRunner
nodes.context=nodes
nodes.controlled.systems=nodes
nodes.jdbc.database.type=hsqldb
-nodes.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbc.driver=org.hsqldb.jdbcDriver
nodes.jdbc.url=jdbc:hsqldb:mem:nodes
nodes.jdbc.username=sa
nodes.jdbc.password=
nodes.patch.path=com.tacitknowledge.util.migration.inttest-tasks.missingpatchstrategy.batch2
nodes.jdbc.systems=jdbcnode1,jdbcnode2,jdbcnode3
nodes.jdbcnode1.database.type=hsqldb
-nodes.jdbcnode1.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode1.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode1.url=jdbc:hsqldb:mem:node1
nodes.jdbcnode1.username=sa
nodes.jdbcnode1.password=
nodes.jdbcnode2.database.type=hsqldb
-nodes.jdbcnode2.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode2.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode2.url=jdbc:hsqldb:mem:node2
nodes.jdbcnode2.username=sa
nodes.jdbcnode2.password=
nodes.jdbcnode3.database.type=hsqldb
-nodes.jdbcnode3.driver=org.hsqldb.jdbc.JDBCDriver
+nodes.jdbcnode3.driver=org.hsqldb.jdbcDriver
nodes.jdbcnode3.url=jdbc:hsqldb:mem:node3
nodes.jdbcnode3.username=sa
nodes.jdbcnode3.password=
@@ -2,7 +2,7 @@
# Configure a context named "race"
#
race.jdbc.database.type=hsqldb
-race.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+race.jdbc.driver=org.hsqldb.jdbcDriver
race.jdbc.url=jdbc:hsqldb:mem:race
race.jdbc.username=sa
race.jdbc.password=
@@ -7,7 +7,7 @@ integration_test.controlled.systems=core,orders,catalog
# Configure a context named "core"
#
core.jdbc.database.type=hsqldb
-core.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+core.jdbc.driver=org.hsqldb.jdbcDriver
core.jdbc.url=jdbc:hsqldb:mem:core
core.jdbc.username=sa
core.jdbc.password=
@@ -16,7 +16,7 @@ core.patch.path=com.tacitknowledge.util.migration.inttest-tasks.core
# Configure a context named "orders"
#
orders.jdbc.database.type=hsqldb
-orders.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orders.jdbc.driver=org.hsqldb.jdbcDriver
orders.jdbc.url=jdbc:hsqldb:mem:orders
orders.jdbc.username=sa
orders.jdbc.password=
@@ -26,27 +26,27 @@ orders.patch.path=com.tacitknowledge.util.migration.inttest-tasks.order
#
catalog.jdbc.systems=jdbccatalog1,jdbccatalog2,jdbccatalog3,jdbccatalog4,jdbccatalog5
catalog.jdbccatalog1.database.type=hsqldb
-catalog.jdbccatalog1.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog1.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog1.url=jdbc:hsqldb:mem:catalog1
catalog.jdbccatalog1.username=sa
catalog.jdbccatalog1.password=
catalog.jdbccatalog2.database.type=hsqldb
-catalog.jdbccatalog2.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog2.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog2.url=jdbc:hsqldb:mem:catalog2
catalog.jdbccatalog2.username=sa
catalog.jdbccatalog2.password=
catalog.jdbccatalog3.database.type=hsqldb
-catalog.jdbccatalog3.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog3.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog3.url=jdbc:hsqldb:mem:catalog3
catalog.jdbccatalog3.username=sa
catalog.jdbccatalog3.password=
catalog.jdbccatalog4.database.type=hsqldb
-catalog.jdbccatalog4.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog4.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog4.url=jdbc:hsqldb:mem:catalog4
catalog.jdbccatalog4.username=sa
catalog.jdbccatalog4.password=
catalog.jdbccatalog5.database.type=hsqldb
-catalog.jdbccatalog5.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog5.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog5.url=jdbc:hsqldb:mem:catalog5
catalog.jdbccatalog5.username=sa
catalog.jdbccatalog5.password=
@@ -1,4 +1,4 @@
-supportsMultipleStatements=false
+supportsMultipleStatements=true
patches.create=CREATE TABLE patches ( \
system_name VARCHAR(30) NOT NULL \
@@ -7,7 +7,7 @@ orchestration.controlled.systems=core,orders,catalog
# Configure a context named "core"
#
core.jdbc.database.type=hsqldb
-core.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+core.jdbc.driver=org.hsqldb.jdbcDriver
core.jdbc.url=jdbc:hsqldb:mem:core
core.jdbc.username=sa
core.jdbc.password=
@@ -17,7 +17,7 @@ core.lockPollRetries=10
# Configure a context named "orders"
#
orders.jdbc.database.type=hsqldb
-orders.jdbc.driver=org.hsqldb.jdbc.JDBCDriver
+orders.jdbc.driver=org.hsqldb.jdbcDriver
orders.jdbc.url=jdbc:hsqldb:mem:orders
orders.jdbc.username=sa
orders.jdbc.password=
@@ -27,12 +27,12 @@ orders.patch.path=patches.orders:com.tacitknowledge.util.migration.tasks.normal
#
catalog.jdbc.systems=jdbccatalog1,jdbccatalog2
catalog.jdbccatalog1.database.type=sybase
-catalog.jdbccatalog1.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog1.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog1.url=jdbc:hsqldb:mem:catalog1
catalog.jdbccatalog1.username=sa
catalog.jdbccatalog1.password=
catalog.jdbccatalog2.database.type=postgres
-catalog.jdbccatalog2.driver=org.hsqldb.jdbc.JDBCDriver
+catalog.jdbccatalog2.driver=org.hsqldb.jdbcDriver
catalog.jdbccatalog2.url=jdbc:hsqldb:mem:catalog2
catalog.jdbccatalog2.username=sa
catalog.jdbccatalog2.password=

0 comments on commit 1806aac

Please sign in to comment.