Move migration scripts to carbon-5 default (src/main/resources/db)

--HG-- rename : petstore-infrastructure/src/main/scripts/migrations/20100218205002_create_products.sql => petstore-infrastructure/src/main/resources/db/migrations/20100218205002_create_products.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100226153955_add_product_description.sql => petstore-infrastructure/src/main/resources/db/migrations/20100226153955_add_product_description.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100226211757_add_product_photo.sql => petstore-infrastructure/src/main/resources/db/migrations/20100226211757_add_product_photo.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100304220628_add_product_number.sql => petstore-infrastructure/src/main/resources/db/migrations/20100304220628_add_product_number.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100305191346_create_items.sql => petstore-infrastructure/src/main/resources/db/migrations/20100305191346_create_items.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100315155917_add_item_description_and_item_price.sql => petstore-infrastructure/src/main/resources/db/migrations/20100315155917_add_item_description_and_item_price.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100408021904_create_order_number_sequence.sql => petstore-infrastructure/src/main/resources/db/migrations/20100408021904_create_order_number_sequence.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100408135825_create_orders_and_line_items.sql => petstore-infrastructure/src/main/resources/db/migrations/20100408135825_create_orders_and_line_items.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100408181318_add_billing_to_orders.sql => petstore-infrastructure/src/main/resources/db/migrations/20100408181318_add_billing_to_orders.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100408202400_rename_item_reference_number_to_number.sql => petstore-infrastructure/src/main/resources/db/migrations/20100408202400_rename_item_reference_number_to_number.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100413015512_add_description_and_unit_price_to_line_item.sql => petstore-infrastructure/src/main/resources/db/migrations/20100413015512_add_description_and_unit_price_to_line_item.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100413024430_add_order_line_to_line_item.sql => petstore-infrastructure/src/main/resources/db/migrations/20100413024430_add_order_line_to_line_item.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100414164731_create_payment_methods.sql => petstore-infrastructure/src/main/resources/db/migrations/20100414164731_create_payment_methods.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100414184750_add_payment_type_to_payments.sql => petstore-infrastructure/src/main/resources/db/migrations/20100414184750_add_payment_type_to_payments.sql rename : petstore-infrastructure/src/main/scripts/migrations/20100825140227_make_order_number_unique.sql => petstore-infrastructure/src/main/resources/db/migrations/20100825140227_make_order_number_unique.sql
testinfected · Sep 1, 2012 · be089ad · be089ad
1 parent 1306867
commit be089ad
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 30 deletions.
diff --git a/petstore-infrastructure/pom.xml b/petstore-infrastructure/pom.xml
@@ -119,7 +119,7 @@
                     <url>${jdbc.url}</url>
                     <username>${jdbc.username}</username>
                     <password>${jdbc.password}</password>
-                    <migrationsPath>${project.basedir}/src/main/scripts/migrations</migrationsPath>
+                    <migrationsPath>${project.basedir}/src/main/resources/db/migrations</migrationsPath>
                 </configuration>
                 <dependencies>
                     <dependency>

diff --git a/...ations/20100218205002_create_products.sql → ...ations/20100218205002_create_products.sql b/...ations/20100218205002_create_products.sql → ...ations/20100218205002_create_products.sql
diff --git a/...0100226153955_add_product_description.sql → ...0100226153955_add_product_description.sql b/...0100226153955_add_product_description.sql → ...0100226153955_add_product_description.sql
diff --git a/...ions/20100226211757_add_product_photo.sql → ...ions/20100226211757_add_product_photo.sql b/...ions/20100226211757_add_product_photo.sql → ...ions/20100226211757_add_product_photo.sql
diff --git a/...ons/20100304220628_add_product_number.sql → ...ons/20100304220628_add_product_number.sql b/...ons/20100304220628_add_product_number.sql → ...ons/20100304220628_add_product_number.sql
diff --git a/...igrations/20100305191346_create_items.sql → ...igrations/20100305191346_create_items.sql b/...igrations/20100305191346_create_items.sql → ...igrations/20100305191346_create_items.sql
diff --git a/...7_add_item_description_and_item_price.sql → ...7_add_item_description_and_item_price.sql b/...7_add_item_description_and_item_price.sql → ...7_add_item_description_and_item_price.sql
diff --git a/...08021904_create_order_number_sequence.sql → ...08021904_create_order_number_sequence.sql b/...08021904_create_order_number_sequence.sql → ...08021904_create_order_number_sequence.sql
diff --git a/...08135825_create_orders_and_line_items.sql → ...08135825_create_orders_and_line_items.sql b/...08135825_create_orders_and_line_items.sql → ...08135825_create_orders_and_line_items.sql
diff --git a/.../20100408181318_add_billing_to_orders.sql → .../20100408181318_add_billing_to_orders.sql b/.../20100408181318_add_billing_to_orders.sql → .../20100408181318_add_billing_to_orders.sql
diff --git a/...ename_item_reference_number_to_number.sql → ...ename_item_reference_number_to_number.sql b/...ename_item_reference_number_to_number.sql → ...ename_item_reference_number_to_number.sql
diff --git a/...scription_and_unit_price_to_line_item.sql → ...scription_and_unit_price_to_line_item.sql b/...scription_and_unit_price_to_line_item.sql → ...scription_and_unit_price_to_line_item.sql
diff --git a/...413024430_add_order_line_to_line_item.sql → ...413024430_add_order_line_to_line_item.sql b/...413024430_add_order_line_to_line_item.sql → ...413024430_add_order_line_to_line_item.sql
diff --git a/...20100414164731_create_payment_methods.sql → ...20100414164731_create_payment_methods.sql b/...20100414164731_create_payment_methods.sql → ...20100414164731_create_payment_methods.sql
diff --git a/...14184750_add_payment_type_to_payments.sql → ...14184750_add_payment_type_to_payments.sql b/...14184750_add_payment_type_to_payments.sql → ...14184750_add_payment_type_to_payments.sql
diff --git a/...100825140227_make_order_number_unique.sql → ...100825140227_make_order_number_unique.sql b/...100825140227_make_order_number_unique.sql → ...100825140227_make_order_number_unique.sql
diff --git a/...ore-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/DatabaseMigrator.java b/...ore-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/DatabaseMigrator.java
@@ -8,15 +8,15 @@
 
 public class DatabaseMigrator {
 
-    private final MigrationProperties properties;
+    private final DataSource dataSource;
 
-    public DatabaseMigrator(Properties properties) {
+    public DatabaseMigrator(DataSource dataSource) {
-        this.properties = new MigrationProperties(properties);
+        this.dataSource = dataSource;
     }
 
-    public void migrate(DataSource dataSource) {
+    public void migrate() {
         DataSourceMigrationManager migrationManager = new DataSourceMigrationManager(dataSource);
-        migrationManager.setMigrationResolver(new ResourceMigrationResolver(properties.migrationsPath()));
+        migrationManager.setMigrationResolver(new ResourceMigrationResolver());
         migrationManager.migrate();
     }
 }
diff --git a/...-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/MigrationProperties.java b/...-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/MigrationProperties.java
diff --git a/...tore-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/TestEnvironment.java b/...tore-infrastructure/src/test/java/test/support/com/pyxis/petstore/db/TestEnvironment.java
@@ -24,15 +24,15 @@ public static TestEnvironment load(final String name) {
 
     public TestEnvironment(Properties properties) {
         loadSpringContext(properties);
-        migrateDatabase(properties);
+        migrateDatabase();
     }
 
     private void loadSpringContext(Properties properties) {
         this.spring = new Spring(properties);
     }
 
-    private void migrateDatabase(Properties properties) {
+    private void migrateDatabase() {
-        new DatabaseMigrator(properties).migrate(spring.getDataSource());
+        new DatabaseMigrator(spring.getDataSource()).migrate();
     }
 
     public <T> T get(Class<T> type) {

diff --git a/petstore-infrastructure/src/test/resources/integration/test.properties b/petstore-infrastructure/src/test/resources/integration/test.properties
@@ -3,5 +3,3 @@ jdbc.url: ${test.jdbc.url}
 jdbc.username: ${test.jdbc.username}
 jdbc.password: ${test.jdbc.password}
 hibernate.dialect: ${test.hibernate.dialect}
-
-migrations.path = ${project.basedir}/src/main/scripts/migrations
diff --git a/petstore-system-tests/pom.xml b/petstore-system-tests/pom.xml
@@ -235,7 +235,7 @@
                     <url>${test.jdbc.url}</url>
                     <username>${test.jdbc.username}</username>
                     <password>${test.jdbc.password}</password>
-                    <migrationsPath>${project.basedir}/../petstore-infrastructure/src/main/scripts/migrations</migrationsPath>
+                    <migrationsPath>${project.basedir}/../petstore-infrastructure/src/main/resources/db/migrations</migrationsPath>
                 </configuration>
                 <dependencies>
                     <dependency>