[Topia-commits] r1457 - in topia/trunk: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-persistence/src/test/java/org/nuiton/topia/persistence topia-soa topia-ui

15 May 2009

Author: tchemit
Date: 2009-05-15 02:12:45 +0000 (Fri, 15 May 2009)
New Revision: 1457

Modified:
   topia/trunk/pom.xml
   topia/trunk/topia-persistence/pom.xml
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java
   topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java
   topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java
   topia/trunk/topia-soa/pom.xml
   topia/trunk/topia-ui/pom.xml
Log:
migrate to nuiton (part 2 : plus de dependances vers du org.codelutin :))

Modified: topia/trunk/pom.xml
===================================================================

--- topia/trunk/pom.xml	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
@@ -33,9 +33,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codelutin</groupId>
-                <artifactId>lutinutil</artifactId>
-                <version>${lutinutil.version}</version>
+                <groupId>org.nuiton</groupId>
+                <artifactId>nuitonutil</artifactId>
+                <version>${nuitonutil.version}</version>
                 <scope>compile</scope>
             </dependency>
 
@@ -140,7 +140,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.6</version>
                 <scope>test</scope>
             </dependency>
 
@@ -177,8 +177,8 @@
 
         <!-- libs version -->
         <generator.version>1.0.0-SNAPSHOT</generator.version>
-        <processor.version>0.18</processor.version>
-        <lutinutil.version>1.0.6</lutinutil.version>
+        <processor.version>1.0.0-SNAPSHOT</processor.version>
+        <nuitonutil.version>1.1.0-SNAPSHOT</nuitonutil.version>
         
         <topia.version>${project.version}</topia.version>
 
@@ -194,7 +194,7 @@
             <plugins>
 
                 <plugin>
-                    <groupId>org.codelutin</groupId>
+                    <groupId>org.nuiton</groupId>
                     <artifactId>maven-processor-plugin</artifactId>
                     <version>${processor.version}</version>
                     <executions>
@@ -205,16 +205,12 @@
                             </goals>
                         </execution>
                     </executions>
-                    <configuration>
-                        <addCompileDirectory>true</addCompileDirectory>
-                        <includes>
-                            <include>**/*.java</include>
-                        </includes>
+                    <configuration>                        
+                        <includes>**/*.java</includes>
                         <filters>
-                            org.codelutin.processor.filters.GeneratorTemplatesFilter,
-                            org.codelutin.processor.filters.ActiveLogsCodeFilter
+                            org.nuiton.processor.filters.GeneratorTemplatesFilter,
+                            org.nuiton.processor.filters.ActiveLogsCodeFilter
                         </filters>
-                        <verbose>${maven.verbose}</verbose>
                     </configuration>
                 </plugin>
 
@@ -273,36 +269,4 @@
         </repository>
     </repositories>
     
-    <profiles>
-        <!-- perform only on a release stage when using the maven-release-plugin -->
-        <profile>
-            <id>release-profile</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- always add license and third-party files to classpath -->
-                    <plugin>
-                        <groupId>org.codelutin</groupId>
-                        <artifactId>maven-license-switcher-plugin</artifactId>
-                        <version>0.8</version>
-                        <executions>
-                            <execution>
-                                <id>attach-licenses</id>
-                                <goals>
-                                    <goal>license</goal>
-                                    <goal>third-party</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

Modified: topia/trunk/topia-persistence/pom.xml
===================================================================
--- topia/trunk/topia-persistence/pom.xml	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
@@ -19,8 +19,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.codelutin</groupId>
-            <artifactId>lutinutil</artifactId>
+            <groupId>org.nuiton</groupId>
+            <artifactId>nuitonutil</artifactId>
         </dependency>
 
         <dependency>
@@ -100,7 +100,7 @@
         <plugins>
 
             <plugin>
-                <groupId>org.codelutin</groupId>
+                <groupId>org.nuiton</groupId>
                 <artifactId>maven-processor-plugin</artifactId>
             </plugin>
 

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -24,7 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codelutin.util.Resource;
+import org.nuiton.util.Resource;
 
  /**
  * ContextUtil.java

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -46,7 +46,7 @@
 import org.nuiton.topia.persistence.TopiaDAODelegator;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaId;
-import org.codelutin.util.ArrayUtil;
+import org.nuiton.util.ArrayUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentFactory;

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -45,8 +45,8 @@
 import org.nuiton.topia.event.TopiaTransactionVetoable;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaEntityAbstract;
-import org.codelutin.util.CategorisedListenerSet;
-import org.codelutin.util.ListenerSet;
+import org.nuiton.util.CategorisedListenerSet;
+import org.nuiton.util.ListenerSet;
 import org.hibernate.Session;
 import org.hibernate.event.PostDeleteEvent;
 import org.hibernate.event.PostDeleteEventListener;
@@ -514,6 +514,7 @@
          * Recherche le context utilisant la session hibernate passe en
          * parametre
          * 
+         * @param parent le context parent
          * @param hibernate la session hibernate que doit utiliser le
          *        TopiaContext pour etre retourne
          * @return le TopiaContext utilisant cette session hibernate ou null si
@@ -561,6 +562,7 @@
         }
 
         /* Création */
+        @Override
         public boolean onPreInsert(PreInsertEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -571,6 +573,7 @@
             return false;
         }
 
+        @Override
         public void onPostInsert(PostInsertEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -581,6 +584,7 @@
         }
 
         /* Chargement */
+        @Override
         public void onPreLoad(PreLoadEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -595,6 +599,7 @@
             }
         }
 
+        @Override
         public void onPostLoad(PostLoadEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -606,6 +611,7 @@
         }
 
         /* Modification */
+        @Override
         public boolean onPreUpdate(PreUpdateEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -616,6 +622,7 @@
             return false;
         }
 
+        @Override
         public void onPostUpdate(PostUpdateEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -629,6 +636,7 @@
         }
 
         /* Suppression */
+        @Override
         public boolean onPreDelete(PreDeleteEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -640,6 +648,7 @@
             return false;
         }
 
+        @Override
         public void onPostDelete(PostDeleteEvent event) {
             TopiaContextImplementor context = getContext(rootContext, event
                     .getSession());
@@ -770,7 +779,10 @@
 
     /**
      * Notify entities listeners for load operation
+     * @param <E> 
+     * @param context 
      * @param entities entities loaded
+     * @return
      */
     public <E extends TopiaEntity> List<E> fireEntitiesLoad(
             TopiaContextImplementor context, List<E> entities) {

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -33,8 +33,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaNotFoundException;
 import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.RecursiveProperties;
-import org.codelutin.util.Resource;
+import org.nuiton.util.RecursiveProperties;
+import org.nuiton.util.Resource;
 
 import java.net.URL;
 import java.util.Properties;

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -43,7 +43,7 @@
 import org.nuiton.eugene.models.object.ObjectModelAttribute;
 import org.nuiton.eugene.models.object.ObjectModelClass;
 import org.nuiton.eugene.models.object.ObjectModelClassifier;
-import org.codelutin.util.StringUtil;
+import org.nuiton.util.StringUtil;
 
 /**
  * Genere des DAOs abstrait par defaut, l'utilisateur peut ensuite en herite

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -64,7 +64,7 @@
 import org.nuiton.topia.framework.TopiaUtil;
 import org.nuiton.topia.persistence.TopiaDAOAbstract;
 import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.FileUtil;
+import org.nuiton.util.FileUtil;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.criterion.Criterion;

Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java
===================================================================
--- topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -6,7 +6,7 @@
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.persistence.TopiaDAO;
 import org.nuiton.topia.persistence.TopiaEntity;
-import org.codelutin.util.IOUtils;
+import org.nuiton.util.IOUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java
===================================================================
--- topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java	2009-05-15 02:12:45 UTC (rev 1457)
@@ -36,7 +36,7 @@
 import org.nuiton.topiatest.DepartmentDAO;
 import org.nuiton.topiatest.Employe;
 import org.nuiton.topiatest.EmployeDAO;
-import org.codelutin.util.FileUtil;
+import org.nuiton.util.FileUtil;
 import org.hibernate.cfg.Environment;
 import org.junit.After;
 import org.junit.AfterClass;

Modified: topia/trunk/topia-soa/pom.xml
===================================================================
--- topia/trunk/topia-soa/pom.xml	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-soa/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
@@ -26,11 +26,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- lutin Dependencies -->
+        <!-- nuiton Dependencies -->
 
         <dependency>
-            <groupId>org.codelutin</groupId>
-            <artifactId>lutinutil</artifactId>
+            <groupId>org.nuiton</groupId>
+            <artifactId>nuitonutil</artifactId>
         </dependency>
 
         <dependency>
@@ -96,7 +96,7 @@
         <plugins>
 
             <plugin>
-                <groupId>org.codelutin</groupId>
+                <groupId>org.nuiton</groupId>
                 <artifactId>maven-processor-plugin</artifactId>
             </plugin>
             

Modified: topia/trunk/topia-ui/pom.xml
===================================================================
--- topia/trunk/topia-ui/pom.xml	2009-05-14 14:12:37 UTC (rev 1456)
+++ topia/trunk/topia-ui/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
@@ -19,8 +19,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.codelutin</groupId>
-            <artifactId>lutinutil</artifactId>
+            <groupId>org.nuiton</groupId>
+            <artifactId>nuitonutil</artifactId>
         </dependency>
 
         <dependency>
@@ -70,7 +70,7 @@
         <plugins>
 
             <plugin>
-                <groupId>org.codelutin</groupId>
+                <groupId>org.nuiton</groupId>
                 <artifactId>maven-processor-plugin</artifactId>
             </plugin>

    

tchemit＠users.labs.libre-entreprise.org