- Wikitty-commits - mailman.cloud.codelutin.com

r26 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by bpoussin＠users.nuiton.org 28 Apr '10

28 Apr '10

Author: bpoussin Date: 2010-04-28 17:33:21 +0200 (Wed, 28 Apr 2010) New Revision: 26 Log: force commit each numberForCommit during syncEngin(). (eric must do tests) Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.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-26 13:17:55 UTC (rev 25) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-04-28 15:33:21 UTC (rev 26) @@ -785,13 +785,16 @@ public UpdateResponse syncEngin() { final WikittyTransaction transaction = new WikittyTransaction(); try { - transaction.begin(); final int numberForCommit = 1000; final WikittySearchEngin searchEngin = getSearchEngin(); final UpdateResponse result = new UpdateResponse(); final List<Wikitty> wikitties = new ArrayList<Wikitty>(numberForCommit); + transaction.begin(); searchEngin.clear(transaction); + transaction.commit(); + transaction.begin(); + getWikittyStorage().scanWikitties(transaction, new WikittyStorage.Scanner() { int count = 0; @@ -806,10 +809,11 @@ // Reindex UpdateResponse response = searchEngin.store(transaction, wikitties); result.add(response); - + transaction.commit(); // Reinit count = 0; wikitties.clear(); + transaction.begin(); } } }

1 0

r25 - in trunk/wikitty-jdbc-impl/src/main: java/org/sharengo/wikitty/jdbc resources
by echatellier＠users.nuiton.org 26 Apr '10

26 Apr '10

Author: echatellier Date: 2010-04-26 15:17:55 +0200 (Mon, 26 Apr 2010) New Revision: 25 Log: Implements solr reindexing Modified: trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-04-23 14:05:56 UTC (rev 24) +++ trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-04-26 13:17:55 UTC (rev 25) @@ -77,6 +77,8 @@ /** basic selection without where clause query property name */ static final public String QUERY_SELECT = "jdbc.queries.select"; + /** basic selection without where clause query property name */ + static final public String QUERY_SELECT_NOTDELETED = "jdbc.queries.select.notdeleted"; /** basic selection with where clause query property name */ static final public String QUERY_SELECT_WHERE = "jdbc.queries.select.where"; /** not dleeted data selection with where clause query property name */ @@ -120,7 +122,7 @@ /** JDBC_PASSWORD property name */ static protected String JDBC_PASSWORD = "jdbc.con.password"; - /** admin table name */ + /** admin table name */ static protected String TABLE_WIKITTY_ADMIN = "wikitty_admin"; /** data table name */ static protected String TABLE_WIKITTY_DATA = "wikitty_data"; @@ -182,8 +184,8 @@ * Get a new connection instance (i.e. it opens a new transaction) plug on * JTA. * + * @param conf configuration * @return a new Connection (db transaction) - * @throws SQLException if the connection fails */ public static synchronized Connection getConnection(Properties conf) { try { Modified: trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-04-23 14:05:56 UTC (rev 24) +++ trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-04-26 13:17:55 UTC (rev 25) @@ -33,6 +33,7 @@ import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_DELETE_WIKITTY_DATA; import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_INSERT_WIKITTY_ADMIN; import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_INSERT_WIKITTY_DATA; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_NOTDELETED; import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE; import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE_NOTDELETED; import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.QUERY_UPDATE_WIKITTY_ADMIN; @@ -408,7 +409,27 @@ @Override public void scanWikitties(WikittyTransaction transaction, Scanner scanner) { - throw new UnsupportedOperationException("Not supported yet."); + Connection connection = getConnection(conf); + try { + Statement statement = connection.createStatement(); + + // get all wikitties + // fails with QUERY_SELECT + ResultSet resultSet = statement.executeQuery( + String.format(conf.getProperty(QUERY_SELECT_NOTDELETED), + COL_ID, TABLE_WIKITTY_ADMIN)); + + resultSet.beforeFirst(); + while (resultSet.next()) { + String id = resultSet.getString(COL_ID); + Wikitty wikitty = restore(transaction, id); + scanner.scan(wikitty); + } + } catch (SQLException eee) { + throw new WikittyException(eee); + } finally { + WikittyJDBCUtil.closeQuietly(connection); + } } /** Modified: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-04-23 14:05:56 UTC (rev 24) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-04-26 13:17:55 UTC (rev 25) @@ -36,6 +36,8 @@ #basic selection query without where clause jdbc.queries.select=SELECT %s FROM %s; +#not deleted data selection query without where clause +jdbc.queries.select.notdeleted=SELECT %s FROM %s WHERE deletionDate IS NULL; #basic selection query with where clause jdbc.queries.select.where=SELECT %s FROM %s WHERE %s = ?; #not deleted data selection query with where clause

1 0

r24 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: jcouteau Date: 2010-04-23 16:05:56 +0200 (Fri, 23 Apr 2010) New Revision: 24 Log: Improve migration doc Modified: trunk/src/site/rst/migration.rst Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2010-04-23 14:02:54 UTC (rev 23) +++ trunk/src/site/rst/migration.rst 2010-04-23 14:05:56 UTC (rev 24) @@ -18,9 +18,15 @@ ==================================== After your application launch and before any request, you should store all the -extensions needed by your application, in their last version. -Then you need to add to the registry all the specific migrations for extensions. +extensions needed by your application, in their last version :: + store(myExtension); + +Then you need to add to the registry all the specific migrations for +extensions:: + + WikittyExtensionMigration.migrationRegistry.put("myExtension", myMigrationClass); + You can now use your data properly, they will be migrated at loading time. If you want to migrate objects before using them (for requests purpose for @@ -32,3 +38,16 @@ store(Client) Take care to the cost of the indexation compared to the data volume. + +Specific migrations +=================== + +Wikitty makes an automatic migration in cas of deleted fields, added fields or +renamed fields (need to add a renameFrom tag on the field). + +For other kind of migration, you might want to create your own migration class +that implements WikittyExtensionMigration. This class only needs to make the +migration from a version to the next version, for example version 1 to version 2. +In cas of a migration needed from version 1 to version 4, Wikitty will +automatically call the classes to migrate form version 1 to 2, then from version +2 to 3 and so on.

1 0

r23 - in trunk: wikitty-hbase-impl wikitty-hbase-impl/solr wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-solr-impl
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: echatellier Date: 2010-04-23 16:02:54 +0200 (Fri, 23 Apr 2010) New Revision: 23 Log: Fix build due to slf4j (impl) missing in test Modified: trunk/wikitty-hbase-impl/ trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-hbase-impl/solr/ trunk/wikitty-jdbc-impl/ trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/ trunk/wikitty-jpa-impl/ trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-solr-impl/ trunk/wikitty-solr-impl/pom.xml Property changes on: trunk/wikitty-hbase-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project build PutObjectStoreDirHere Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-04-23 13:48:33 UTC (rev 22) +++ trunk/wikitty-hbase-impl/pom.xml 2010-04-23 14:02:54 UTC (rev 23) @@ -61,6 +61,15 @@ <scope>compile</scope> </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.11</version> + <scope>test</scope> + </dependency> +  <dependency> Property changes on: trunk/wikitty-jms-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project PutObjectStoreDirHere Property changes on: trunk/wikitty-jpa-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project PutObjectStoreDirHere solr Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-04-23 13:48:33 UTC (rev 22) +++ trunk/wikitty-jpa-impl/pom.xml 2010-04-23 14:02:54 UTC (rev 23) @@ -29,6 +29,13 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.11</version> + <scope>test</scope> + </dependency>  <dependency> @@ -73,7 +80,7 @@ <version>${spring.version}</version> </dependency> -  +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>core-wikitty-api</artifactId> Property changes on: trunk/wikitty-solr-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project PutObjectStoreDirHere solr Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-04-23 13:48:33 UTC (rev 22) +++ trunk/wikitty-solr-impl/pom.xml 2010-04-23 14:02:54 UTC (rev 23) @@ -34,7 +34,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId>

1 0

r22 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: echatellier Date: 2010-04-23 15:48:33 +0200 (Fri, 23 Apr 2010) New Revision: 22 Log: Fix migration loop (order was still incorrect). Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 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 13:43:59 UTC (rev 21) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-23 13:48:33 UTC (rev 22) @@ -74,9 +74,15 @@ // Add all extension and replace old by the new for (WikittyExtension extension : wikitty.getExtensions()) { // add one by one to manage require - addExtension(service, transaction, result, extension); + + // during loop add new when old one is found + if (extension.equals(oldExt)) { + addExtension(service, transaction, result, newExt); + } + else { + addExtension(service, transaction, result, extension); + } } - addExtension(service, transaction, result, newExt); // Copy other values Set<String> fqFieldNames = wikitty.fieldNames();

1 0

r21 - in trunk: . src/site src/site/rst
by jcouteau＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: jcouteau Date: 2010-04-23 15:43:59 +0200 (Fri, 23 Apr 2010) New Revision: 21 Log: Make site using rst Added: trunk/src/site/rst/index.rst Modified: trunk/pom.xml trunk/src/site/site.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 09:49:39 UTC (rev 20) +++ trunk/pom.xml 2010-04-23 13:43:59 UTC (rev 21) @@ -151,6 +151,22 @@ </properties> <build> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build>  Added: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst (rev 0) +++ trunk/src/site/rst/index.rst 2010-04-23 13:43:59 UTC (rev 21) @@ -0,0 +1,2 @@ +Wikitty +======= Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-04-23 09:49:39 UTC (rev 20) +++ trunk/src/site/site.xml 2010-04-23 13:43:59 UTC (rev 21) @@ -11,6 +11,7 @@ <body> <menu name="Overview"> <item name="Accueil" href="index.html"/> + <item name="Migration" href="migration.html"/> <item name="GWT problem" href="gwt.html"/> </menu>

1 0

r20 - in trunk: wikitty-api wikitty-hbase-impl wikitty-jdbc-impl wikitty-jpa-impl wikitty-solr-impl
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: echatellier Date: 2010-04-23 11:49:39 +0200 (Fri, 23 Apr 2010) New Revision: 20 Log: Quick update dependencies version and scope. Especially for log4j & slf4j. Modified: trunk/wikitty-api/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-04-23 09:38:33 UTC (rev 19) +++ trunk/wikitty-api/pom.xml 2010-04-23 09:49:39 UTC (rev 20) @@ -43,7 +43,7 @@ <scope>test</scope> </dependency> -  +  <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -53,13 +53,12 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-04-23 09:38:33 UTC (rev 19) +++ trunk/wikitty-hbase-impl/pom.xml 2010-04-23 09:49:39 UTC (rev 20) @@ -47,7 +47,7 @@ <scope>test</scope> </dependency> -  +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>core-wikitty-api</artifactId> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-04-23 09:38:33 UTC (rev 19) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-04-23 09:49:39 UTC (rev 20) @@ -83,7 +83,8 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.118</version> + <version>1.2.127</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.experlog</groupId> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-04-23 09:38:33 UTC (rev 19) +++ trunk/wikitty-jpa-impl/pom.xml 2010-04-23 09:49:39 UTC (rev 20) @@ -91,7 +91,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.5.0-CR-1</version> + <version>3.5.1-Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -134,9 +134,9 @@ <version>1.1</version> </dependency> <dependency> - <groupId>org.hibernate.java-persistence</groupId> - <artifactId>jpa-api</artifactId> - <version>2.0-cr-1</version> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.0.Final</version> </dependency>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-04-23 09:38:33 UTC (rev 19) +++ trunk/wikitty-solr-impl/pom.xml 2010-04-23 09:49:39 UTC (rev 20) @@ -34,13 +34,13 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>runtime</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.5.8</version> - <scope>runtime</scope> + <version>1.5.11</version> + <scope>test</scope> </dependency> <dependency>

1 0

r19 - trunk
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: echatellier Date: 2010-04-23 11:38:33 +0200 (Fri, 23 Apr 2010) New Revision: 19 Log: Disable gwt dependancies (unused) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 09:30:05 UTC (rev 18) +++ trunk/pom.xml 2010-04-23 09:38:33 UTC (rev 19) @@ -63,7 +63,7 @@ <scope>compile</scope> </dependency> -  +  </dependencies> @@ -141,12 +141,12 @@  <projectId>wikitty</projectId> -  - <gwt.version>1.7.0</gwt.version> - <junit.version>4.7</junit.version> - <spring.version>3.0.1.RELEASE</spring.version> - <hessian.version>3.1.6</hessian.version> - <jetty.version>6.1.22</jetty.version> +  +  + <junit.version>4.7</junit.version> + <spring.version>3.0.1.RELEASE</spring.version> + <hessian.version>3.1.6</hessian.version> + <jetty.version>6.1.22</jetty.version> </properties>

1 0

r18 - trunk
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

Author: echatellier Date: 2010-04-23 11:30:05 +0200 (Fri, 23 Apr 2010) New Revision: 18 Log: Update log4j and move it to test scope. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 09:27:32 UTC (rev 17) +++ trunk/pom.xml 2010-04-23 09:30:05 UTC (rev 18) @@ -32,7 +32,7 @@ <version>1.0.2</version--> </parent> -<dependencyManagement> + <dependencyManagement> <dependencies> <dependency> @@ -52,8 +52,8 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>runtime</scope> + <version>1.2.16</version> + <scope>test</scope> </dependency> <dependency>

1 0

r17 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org 23 Apr '10

23 Apr '10

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();

1 0