r2768 - in trunk: topia-service-migration topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/test/java/org/nuiton/topia/replication topia-service-replication/src/test/java/org/nuiton/topia/replication/operation topia-service-security topia-service-security/src/test/java/org/nuiton/topia/security - Topia-commits

14 Jul 2013

Author: tchemit
Date: 2013-07-14 21:40:12 +0200 (Sun, 14 Jul 2013)
New Revision: 2768

Url: http://nuiton.org/projects/topia/repository/revisions/2768

Log:
refs #2088: remove i18n from ToPIA
optimize dependencies


Modified:
   trunk/topia-service-migration/pom.xml
   trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java
   trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java
   trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java
   trunk/topia-service-security/pom.xml
   trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java

Modified: trunk/topia-service-migration/pom.xml
===================================================================

--- trunk/topia-service-migration/pom.xml	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-migration/pom.xml	2013-07-14 19:40:12 UTC (rev 2768)
@@ -70,6 +70,11 @@
     </dependency>
 
     <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>

Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java
===================================================================
--- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java	2013-07-14 19:40:12 UTC (rev 2768)
@@ -43,8 +43,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.nuiton.i18n.I18n._;
-
 /**
  * Pour attacher une association.
  * <p/>
@@ -154,8 +152,7 @@
 
         if (ownerIds == null || ownerIds.isEmpty()) {
             // pas de donnees a traiter
-            log.info(_("topia.replication.attachAssociation.nothing.to.do",
-                       ownerOperator));
+            log.info("Nothing to attach...");
             return;
         }
 

Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java
===================================================================
--- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java	2013-07-14 19:40:12 UTC (rev 2768)
@@ -27,7 +27,6 @@
 
 import org.apache.commons.logging.Log;
 import org.junit.Assert;
-import org.nuiton.i18n.I18n;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.framework.TopiaContextImplementor;
@@ -49,7 +48,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -92,8 +90,6 @@
 
         if (!init) {
 
-            I18n.setDefaultLocale(Locale.FRANCE);
-
             try {
                 context = createDb("source");
             } catch (Exception e) {
@@ -620,9 +616,9 @@
     }
 
     protected void createSupportedBeforeOperation(TopiaEntityEnum contract,
-                                                    TopiaEntity entity,
-                                                    Class<? extends TopiaReplicationOperation> operationClass,
-                                                    Object... parameters) throws Exception {
+                                                  TopiaEntity entity,
+                                                  Class<? extends TopiaReplicationOperation> operationClass,
+                                                  Object... parameters) throws Exception {
 
         getLog().info("entity " + entity.getTopiaId());
         prepareModel(entity.getTopiaId());

Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java
===================================================================
--- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java	2013-07-14 19:40:12 UTC (rev 2768)
@@ -37,8 +37,6 @@
 
 import java.util.List;
 
-import static org.nuiton.i18n.I18n._;
-
 /**
  * @author tchemit <chemit@codelutin.com>
  * @since 2.2.0
@@ -52,7 +50,8 @@
                          Object... parameters) {
 
         throw new UnsupportedOperationException(
-                _("topia.replication.error.operation.uncreatable", getClass()));
+                String.format("The operation %1$s is internal and can not be added using the api.",
+                              getClass()));
     }
 
     @Override

Modified: trunk/topia-service-security/pom.xml
===================================================================
--- trunk/topia-service-security/pom.xml	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-security/pom.xml	2013-07-14 19:40:12 UTC (rev 2768)
@@ -68,6 +68,11 @@
     </dependency>
 
     <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>

Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java
===================================================================
--- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java	2013-07-14 06:57:56 UTC (rev 2767)
+++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java	2013-07-14 19:40:12 UTC (rev 2768)
@@ -34,7 +34,6 @@
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.nuiton.i18n.I18n;
 import org.nuiton.topia.TestHelper;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaContextFactory;
@@ -68,7 +67,6 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Properties;
 
 import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD;
@@ -84,7 +82,7 @@
 
     private static final Log log = LogFactory.getLog(TopiaSecurityTest.class);
 
-   protected String dbPath;
+    protected String dbPath;
 
     protected TopiaContext context;
 
@@ -106,7 +104,6 @@
 
     @BeforeClass
     public static void init() throws Exception {
-        I18n.init(null, Locale.FRANCE);
         tesDir = TestHelper.getTestBasedir(TopiaSecurityTest.class);
 
     }
@@ -301,6 +298,7 @@
             context.closeContext();
         }
     }
+
     @Test
     public void testLoginThimel() throws Exception {
         /* Authentification de l'utilisateur Thimel */

    

tchemit＠users.nuiton.org

tags

participants (1)