[Chorem-commits] r402 - in trunk: . chorem-entities chorem-entities/src/main/java/org/chorem chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/filters

14 Feb 2014

Author: ymartel
Date: 2014-02-14 15:25:58 +0100 (Fri, 14 Feb 2014)
New Revision: 402

Url: http://chorem.org/projects/chorem/repository/revisions/402

Log:
upgrade some dependencies versions

Modified:
   trunk/chorem-entities/pom.xml
   trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
   trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java
   trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java
   trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java
   trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
   trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java
   trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java
   trunk/chorem-webmotion/pom.xml
   trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java
   trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java
   trunk/pom.xml

Modified: trunk/chorem-entities/pom.xml
===================================================================

--- trunk/chorem-entities/pom.xml	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/pom.xml	2014-02-14 14:25:58 UTC (rev 402)
@@ -29,6 +29,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -24,10 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.wikitty.WikittyService;
-import org.nuiton.wikitty.entities.Wikitty;
-import org.nuiton.wikitty.entities.WikittyExtension;
+import org.nuiton.config.ApplicationConfig;
 import org.nuiton.wikitty.query.WikittyQuery;
 import org.nuiton.wikitty.query.WikittyQueryMaker;
 import org.nuiton.wikitty.query.WikittyQueryResult;

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -26,7 +26,6 @@
 import org.chorem.entities.ChoremUser;
 import org.chorem.entities.Company;
 import org.chorem.entities.CompanyHR;
-import org.chorem.entities.CompanyHRImpl;
 import org.chorem.entities.CompanyImpl;
 import org.chorem.entities.Configuration;
 import org.chorem.entities.ConfigurationImpl;
@@ -40,7 +39,7 @@
 import org.chorem.entities.QuotationMigration;
 import org.chorem.entities.Task;
 import org.chorem.entities.Time;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 import org.nuiton.wikitty.WikittyClient;
 import org.nuiton.wikitty.WikittyService;
 import org.nuiton.wikitty.WikittyServiceFactory;
@@ -50,6 +49,7 @@
 import org.nuiton.wikitty.query.WikittyQuery;
 import org.nuiton.wikitty.query.WikittyQueryMaker;
 import org.nuiton.wikitty.query.WikittyQueryResult;
+import org.parboiled.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -57,8 +57,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.parboiled.common.StringUtils;
-
 /**
  * Proxy pour l'application. Certaines methodes specifiques pour l'application
  * peuvent y etre ajoutees (ex: des find particulier)

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -28,7 +28,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 import org.nuiton.wikitty.WikittyConfigOption;
 
 /**

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -22,7 +22,7 @@
  */
 package org.chorem;
 
-import org.nuiton.util.ApplicationConfig.ActionDef;
+import org.nuiton.config.ConfigActionDef;
 
 /**
  *
@@ -32,7 +32,7 @@
  * Last update: $Date$
  * by : $Author$
  */
-public enum ChoremConfigAction implements ActionDef {
+public enum ChoremConfigAction implements ConfigActionDef {
 
     HELP(ChoremAction.class.getName() + "#help", "-h", "--help"),
     INFO(ChoremAction.class.getName() + "#configInfo", "-i", "--config-info" , "--configInfo"),

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -22,52 +22,53 @@
  */
 package org.chorem;
 
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ConfigOptionDef;
 
-import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.t;
 
 /**
  * Chorem option definition.
  *
  * @author poussin
  */
-public enum ChoremConfigOption implements ApplicationConfig.OptionDef {
+public enum ChoremConfigOption implements ConfigOptionDef {
     CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME,
-            _("chorem.config.configFileName.description"),
+            t("chorem.config.configFileName.description"),
             "chorem.properties", String.class, false, false),
 //    CHOREM_MIGRATION_INVOICE(
 //            WikittyConfigOption.WIKITTY_MIGRATION_CLASS + Invoice.EXT_INVOICE,
-//            _("Classe de migration de l'extension Invoice"),
+//            t("Classe de migration de l'extension Invoice"),
 //            InvoiceMigration.class.getName(),
 //            Class.class, false, false),
 //    CHOREM_MIGRATION_QUOTATION(
 //            WikittyConfigOption.WIKITTY_MIGRATION_CLASS + Quotation.EXT_QUOTATION,
-//            _("Classe de migration de l'extension Quotation"),
+//            t("Classe de migration de l'extension Quotation"),
 //            QuotationMigration.class.getName(),
 //            Class.class, false, false),
     CHOREM_EXTENSION_SEARCH_EXCLUSION(
             "chorem.extension.search.exclusion",
-            _("Liste des extensions qui ne doivent pas apparaitre dans les resultats"),
+            t("Liste des extensions qui ne doivent pas apparaitre dans les resultats"),
             "Configuration,Interval,WikittyTreeNode,WikittyToken,WikittyUser",
             String.class, false, false),
     CHOREM_AUTHENTICATION(
             "chorem.authentication",
-            _("If true authentication is used to acces page (default: false)"),
+            t("If true authentication is used to acces page (default: false)"),
             "false",
             Boolean.class, false, false),
     CHOREM_DOMAIN(
             "chorem.domain",
-            _("Domain qui permet de trouver la base de donnees a utiliser"),
+            t("Domain qui permet de trouver la base de donnees a utiliser"),
             "default",
             String.class, false, false),
     CHOREM_LOGIN(
             "chorem.admin.login",
-            _("Login as default login for action on command line"),
+            t("Login as default login for action on command line"),
             "",
             String.class, false, false),
     CHOREM_PASSWORD(
             "chorem.import.csv.format",
-            _("Password associated with login used"),
+            t("Password associated with login used"),
             "",
             String.class, false, false);
 

Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -22,11 +22,12 @@
  */
 package org.chorem;
 
-import java.util.Arrays;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 
+import java.util.Arrays;
+
 /**
  *
  * @author poussin

Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -23,15 +23,6 @@
 package org.chorem;
 
 import au.com.bytecode.opencsv.CSVReader;
-import java.io.FileReader;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
@@ -42,21 +33,29 @@
 import org.chorem.entities.Company;
 import org.chorem.entities.CompanyImpl;
 import org.chorem.entities.ContactDetailsImpl;
-import org.chorem.entities.Employee;
 import org.chorem.entities.EmployeeImpl;
 import org.chorem.entities.FinancialTransaction;
 import org.chorem.entities.FinancialTransactionImpl;
 import org.chorem.entities.Invoice;
 import org.chorem.entities.InvoiceImpl;
-import org.chorem.entities.Person;
 import org.chorem.entities.PersonImpl;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ApplicationConfig.Action.Step;
+import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig.Action.Step;
 import org.nuiton.wikitty.entities.BusinessEntityImpl;
 import org.nuiton.wikitty.query.WikittyQuery;
 import org.nuiton.wikitty.query.WikittyQueryMaker;
 import org.nuiton.wikitty.query.WikittyQueryResult;
 
+import java.io.FileReader;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Les donnees doivent etre exportees de la base postgresql avec les commandes:
  * <pre>

Modified: trunk/chorem-webmotion/pom.xml
===================================================================
--- trunk/chorem-webmotion/pom.xml	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-webmotion/pom.xml	2014-02-14 14:25:58 UTC (rev 402)
@@ -255,7 +255,7 @@
 
       <plugin>
         <groupId>org.nuiton.i18n</groupId>
-        <artifactId>maven-i18n-plugin</artifactId>
+        <artifactId>i18n-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>scan-java-sources</id>

Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -23,15 +23,16 @@
  */
 
 
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.ChoremClient;
 import org.chorem.ChoremConfig;
 import org.debux.webmotion.server.call.Call;
 import org.debux.webmotion.server.call.HttpContext;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  *
  * @author poussin

Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java	2014-02-14 14:25:58 UTC (rev 402)
@@ -32,7 +32,7 @@
 import org.debux.webmotion.server.WebMotionFilter;
 import org.debux.webmotion.server.call.HttpContext;
 import org.debux.webmotion.server.render.Render;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 import org.nuiton.wikitty.entities.WikittyUser;
 import org.nuiton.wikitty.query.WikittyQuery;
 import org.nuiton.wikitty.query.WikittyQueryMaker;

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-02-12 17:13:34 UTC (rev 401)
+++ trunk/pom.xml	2014-02-14 14:25:58 UTC (rev 402)
@@ -86,19 +86,25 @@
 
     <opencsvVersion>2.3</opencsvVersion>
     <processPluginVersion>1.1</processPluginVersion>
-    <eugenePluginVersion>2.6</eugenePluginVersion>
-    <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion>
+    <eugenePluginVersion>2.7.4</eugenePluginVersion>
+    <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion>
+    <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion>
     <nuitonWebVersion>1.7</nuitonWebVersion>
-    <nuitonI18nVersion>2.3.1</nuitonI18nVersion>
-    <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion>
-    <wikittyVersion>3.10</wikittyVersion>
+    <nuitonI18nVersion>3.0</nuitonI18nVersion>
+    <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion>
+    <wikittyVersion>3.11-SNAPSHOT</wikittyVersion>
     <slf4jVersion>1.7.6</slf4jVersion>
-    <javaxMailVersion>1.4.3</javaxMailVersion>
-    <servletApiVersion>2.5</servletApiVersion>
+    <javaxMailVersion>1.5.0-b01</javaxMailVersion>
+    <servletApiVersion>3.0-alpha-1</servletApiVersion>
     <jspApiVersion>2.0</jspApiVersion>
     <h2Version>1.3.175</h2Version>
     <webmotionVersion>2.4-SNAPSHOT</webmotionVersion>
     <jstlVersion>1.2</jstlVersion>
+    <nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version>
+    <nuitonjsJquery.version>1.8.3-1</nuitonjsJquery.version>
+    <nuitonjsJqueryui.version>1.9.2-1</nuitonjsJqueryui.version>
+    <nuitonjsJqplot.version>1.0.4r1121-1</nuitonjsJqplot.version>
+    <nuitonjsBootstrap.version>2.3.2-1</nuitonjsBootstrap.version>
 
     <!-- license to use  -->
     <license.licenseName>agpl_v3</license.licenseName>
@@ -158,8 +164,15 @@
       <version>${nuitonUtilsVersion}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+      <version>${nuitonConfigVersion}</version>
+    </dependency>
 
 
+
+
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-csv</artifactId>
@@ -241,27 +254,27 @@
     <dependency>
       <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-angularjs</artifactId>
-      <version>1.2.11-1</version>
+      <version>${nuitonjsAngularjs.version}</version>
     </dependency>
     <dependency>
       <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-jquery</artifactId>
-      <version>1.8.3-1</version>
+      <version>${nuitonjsJquery.version}</version>
     </dependency>
     <dependency>
       <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-jquery-ui</artifactId>
-      <version>1.9.2-1</version>
+      <version>${nuitonjsJqueryui.version}</version>
     </dependency>
     <dependency>
       <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-jqplot</artifactId>
-      <version>1.0.4r1121-1</version>
+      <version>${nuitonjsJqplot.version}</version>
     </dependency>
     <dependency>
       <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-bootstrap</artifactId>
-      <version>2.3.2-1</version>
+      <version>${nuitonjsBootstrap.version}</version>
     </dependency>
     <!-- <dependency>
       <groupId>org.nuiton.js</groupId>
@@ -324,7 +337,7 @@
 
         <plugin>
           <groupId>org.nuiton.i18n</groupId>
-          <artifactId>maven-i18n-plugin</artifactId>
+          <artifactId>i18n-maven-plugin</artifactId>
           <version>${nuitonI18nVersion}</version>
         </plugin>

    

[Chorem-commits] r402 - in trunk: . chorem-entities chorem-entities/src/main/java/org/chorem chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/filters

ymartel＠users.chorem.org