Author: echatellier Date: 2010-04-23 11:27:32 +0200 (Fri, 23 Apr 2010) New Revision: 17 Log: Migration need to use current opened transaction Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-04-23 09:18:34 UTC (rev 16) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-04-23 09:27:32 UTC (rev 17) @@ -409,7 +409,7 @@ // Test if extension is never use in this version if(nextExtension != null) { - result = migration.migrate(this, result, currentExtension, nextExtension); + result = migration.migrate(this, transaction, result, currentExtension, nextExtension); currentExtension = nextExtension; } Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java 2010-04-23 09:18:34 UTC (rev 16) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java 2010-04-23 09:27:32 UTC (rev 17) @@ -45,6 +45,7 @@ * Migrate wikitty data from oldExt version to newExt. * * @param service Wikitty service that do migration + * @param transaction current transaction to use * @param wikitty Wikitty object that contains data in old version * extension format * @param oldExt old extension definition @@ -52,7 +53,7 @@ * @return same wikitty as argument if nothing to do, or new wikitty * if some modification is done */ - public Wikitty migrate(WikittyService service, Wikitty wikitty, - WikittyExtension oldExt, WikittyExtension newExt); + public Wikitty migrate(AbstractWikittyService service, WikittyTransaction transaction, + Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt); } Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-23 09:18:34 UTC (rev 16) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-23 09:27:32 UTC (rev 17) @@ -43,17 +43,18 @@ * Recursively add extension with requires ones (orderer). * * @param service service + * @param transaction current transaction to use * @param wikitty wikitty to add extension to * @param newExt extension to add */ - protected void addExtension(WikittyService service, Wikitty wikitty, WikittyExtension newExt) { + protected void addExtension(AbstractWikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension newExt) { // manage requires before current String requires = newExt.getRequires(); if (StringUtils.isNotEmpty(requires)) { for (String require : requires.split(",")) { - WikittyExtension newRequireExt = service.restoreExtensionLastVersion(require); - addExtension(service, wikitty, newRequireExt); + WikittyExtension newRequireExt = service.restoreExtensionLastVersion(transaction, require); + addExtension(service, transaction, wikitty, newRequireExt); } } @@ -62,7 +63,7 @@ } @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + public Wikitty migrate(AbstractWikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { String wikittyId = wikitty.getId(); String wikittyVersion = wikitty.getVersion(); @@ -73,9 +74,9 @@ // Add all extension and replace old by the new for (WikittyExtension extension : wikitty.getExtensions()) { // add one by one to manage require - addExtension(service, result, extension); + addExtension(service, transaction, result, extension); } - addExtension(service, result, newExt); + addExtension(service, transaction, result, newExt); // Copy other values Set<String> fqFieldNames = wikitty.fieldNames();