Author: tchemit Date: 2014-01-22 20:49:35 +0100 (Wed, 22 Jan 2014) New Revision: 397 Url: http://chorem.org/projects/chorem/repository/revisions/397 Log: use wikitty 3.10 fix migration api Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/pom.xml Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-01-22 19:49:35 UTC (rev 397) @@ -83,9 +83,9 @@ @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty oldWikitty,Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service,oldWikitty, wikitty, oldExt, newExt); if (Employee.EXT_EMPLOYEE.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-01-22 19:49:35 UTC (rev 397) @@ -96,9 +96,9 @@ } @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty oldWikitty, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service,oldWikitty, wikitty, oldExt, newExt); if (Invoice.EXT_INVOICE.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-01-22 19:49:35 UTC (rev 397) @@ -18,9 +18,9 @@ public class Quotation18Migration extends WikittyExtensionMigrationRename { @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty oldWikitty, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service, oldWikitty, wikitty, oldExt, newExt); if (Quotation.EXT_QUOTATION.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-01-22 19:49:35 UTC (rev 397) @@ -54,9 +54,9 @@ @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty oldWikitty, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service, oldWikitty, wikitty, oldExt, newExt); if (Quotation.EXT_QUOTATION.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-01-22 19:49:35 UTC (rev 397) @@ -55,9 +55,9 @@ } @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty oldWikitty, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service, oldWikitty, wikitty, oldExt, newExt); if (Employee.EXT_EMPLOYEE.equals(newExt.getName())) { String oldVersion = oldExt.getVersion(); Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-01-22 19:49:35 UTC (rev 397) @@ -18,7 +18,6 @@ import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; -import org.nuiton.wikitty.query.conditions.Aggregate; /** * Makes the calculation for the adc. @@ -233,8 +232,6 @@ /** * Get all the employees of the company having the EmployeeHR extension - * @param client - * @param company * @return */ protected List<EmployeeHR> getEmployeesHR() { @@ -307,8 +304,7 @@ /** * Returns multiple adc form the given employee list. - * @param client - * @param employees + * @param real * @return adc of the employees */ public Map<String, Double> getMultipleAdc(boolean real) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-02 11:45:37 UTC (rev 396) +++ trunk/pom.xml 2014-01-22 19:49:35 UTC (rev 397) @@ -91,7 +91,7 @@ <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> - <wikittyVersion>3.10-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.10</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> @@ -112,8 +112,10 @@ <repository> <id>chorem-group</id> - <name>Chorem Group</name> <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> + <releases> + <enabled>true</enabled> + </releases> <snapshots> <enabled>true</enabled> </snapshots> @@ -121,6 +123,19 @@ </repositories> + <pluginRepositories> + <pluginRepository> + <id>chorem-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies>