r3736 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/service lima-swing lima-swing/src/main/resources/i18n - Lima-commits

6 Jan 2014

Author: sbavencoff
Date: 2014-01-06 17:20:04 +0100 (Mon, 06 Jan 2014)
New Revision: 3736

Url: http://chorem.org/projects/lima/repository/revisions/3736

Log:
refs #370 : update JAXX to 2.6

Modified:
   trunk/lima-business/pom.xml
   trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
   trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
   trunk/lima-swing/pom.xml
   trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
   trunk/pom.xml

Modified: trunk/lima-business/pom.xml
===================================================================

--- trunk/lima-business/pom.xml	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/pom.xml	2014-01-06 16:20:04 UTC (rev 3736)
@@ -83,6 +83,10 @@
       <artifactId>topia-service-migration</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
@@ -95,6 +99,10 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
@@ -106,10 +114,9 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-ejbd</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.nuiton.jaxx</groupId>
-      <artifactId>jaxx-config</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
 
   </dependencies>

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java	2014-01-06 16:20:04 UTC (rev 3736)
@@ -34,8 +34,9 @@
 import org.nuiton.topia.TopiaContextFactory;
 import org.nuiton.topia.migration.TopiaMigrationEngine;
 import org.nuiton.topia.migration.TopiaMigrationService;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ArgumentsParserException;
+import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ConfigOptionDef;
+import org.nuiton.config.ArgumentsParserException;
 
 import java.io.File;
 
@@ -174,7 +175,7 @@
      * information for jaxx configuration frame ({@link #type},
      * {@link #transientBoolean}, {@link #finalBoolean}...)
      */
-    public enum Option implements OptionDef {
+    public enum Option implements ConfigOptionDef {
 
         CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.configFileName.description"), "lima.properties", String.class, true, true),
         DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false),

Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java	2014-01-06 16:20:04 UTC (rev 3736)
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.business.ServiceListener;
 import org.chorem.lima.business.ServiceMonitorable;
-import  org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
 
 import javax.ejb.embeddable.EJBContainer;
 import javax.naming.NamingException;

Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-swing/pom.xml	2014-01-06 16:20:04 UTC (rev 3736)
@@ -93,6 +93,16 @@
     </dependency>
 
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-decorator</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>
@@ -103,10 +113,6 @@
     </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
-      <artifactId>swingx-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-autocomplete</artifactId>
     </dependency>
     <dependency>
@@ -131,6 +137,11 @@
       <artifactId>commons-io</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
     <!--  for remote mode only -->
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2014-01-06 16:20:04 UTC (rev 3736)
@@ -79,6 +79,7 @@
 lima.config.category.directories.description=Répertoires utilisés par Lima
 lima.config.category.other=Autre
 lima.config.category.other.description=Autre propriétés de configuration
+lima.config.colorselectionfocus=
 lima.config.colorselectionfocus.description=Couleur des bordures de la séléction
 lima.config.colorselectionfocus.label=Couleur de l'encadrement de sélection d'une cellule
 lima.config.configFileName.description=Le nom du fichier de configuration de l'application

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/pom.xml	2014-01-06 16:20:04 UTC (rev 3736)
@@ -152,6 +152,8 @@
 
     <!-- customized libs version -->
     <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
+    <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
+    <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion>
     <nuitonProfilingVersion>2.7</nuitonProfilingVersion>
     <eugenePluginVersion>2.6.3</eugenePluginVersion>
     <!-- Do not move since
@@ -233,6 +235,18 @@
       </dependency>
 
       <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>14.0.1</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-utils</artifactId>
         <version>${nuitonUtilsVersion}</version>
@@ -240,6 +254,18 @@
 
       <dependency>
         <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-config</artifactId>
+        <version>${nuitonConfigVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-decorator</artifactId>
+        <version>${nuitonDecoratorVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
         <artifactId>nuiton-profiling</artifactId>
         <version>${nuitonProfilingVersion}</version>
       </dependency>
@@ -362,13 +388,6 @@
 
       <dependency>
         <groupId>org.swinglabs.swingx</groupId>
-        <artifactId>swingx-common</artifactId>
-        <version>${swingxVersion}</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.swinglabs.swingx</groupId>
         <artifactId>swingx-autocomplete</artifactId>
         <version>${swingxVersion}</version>
         <scope>compile</scope>

    

r3736 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/service lima-swing lima-swing/src/main/resources/i18n

sbavencoff＠users.chorem.org

tags

participants (1)