r2874 - in trunk: . pollen-business pollen-business/src/main/java/org/chorem/pollen/business/services pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence pollen-ui pollen-votecounting - Pollen-commits

18 Feb 2010

Author: fdesbois
Date: 2010-02-18 19:57:57 +0100 (Thu, 18 Feb 2010)
New Revision: 2874

Modified:
   trunk/pollen-business/pom.xml
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml
   trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml
   trunk/pollen-ui/pom.xml
   trunk/pollen-votecounting/pom.xml
   trunk/pom.xml
Log:
Commit Evo #108

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

--- trunk/pollen-business/pom.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/pom.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.chorem</groupId>
         <artifactId>pollen</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.chorem.pollen</groupId>
@@ -54,7 +54,14 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
     </dependencies>
 
     <!-- ************************************************************* -->
@@ -75,16 +82,46 @@
         <plugins>
             
              <!-- Plug in Topia -->
-            <plugin>
+             <plugin>
                 <groupId>org.nuiton.eugene</groupId>
                 <artifactId>maven-eugene-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <!-- By default, generation from ObjectModel -->
+                        <configuration>
+                            <!-- Corresponding to extracted package from zargo file -->
+                            <fullPackagePath>org.chorem.pollen.business</fullPackagePath>
+                            <!-- DefaultPackage used for DAOHelper generation -->
+                            <defaultPackage>org.chorem.pollen.business.persistence</defaultPackage>
+                            <templates>
+                                org.nuiton.topia.generator.TopiaMetaTransformer
+                            </templates>
+                            <!-- Config for copyVersionFiles -->
+                            <includes>**/*.objectmodel</includes>
+                            <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/pollen</copyVersionDir>
+                            <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
+                            <!-- Warning : the overwrite is working for both goals -->
+                            <overwrite>true</overwrite>
+                        </configuration>
+                        <goals>
+                            <goal>smart-generate</goal>
+                            <goal>copyVersionFiles</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--<plugin>
+                <groupId>org.nuiton.eugene</groupId>
+                <artifactId>maven-eugene-plugin</artifactId>
                 <version>${eugene.version}</version>
                 <executions>
+
                     <execution>
                         <phase>generate-sources</phase>
-                        <!--Configuration of model generator-->
+                        Configuration of model generator
                         <configuration>
-                            <!--reader>org.nuiton.eugene.ObjectModelReader</reader-->
+                            reader>org.nuiton.eugene.ObjectModelReader</reader
                             <includes>**/*.objectmodel</includes>
                             <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates>
                             <defaultPackage>org.chorem.pollen.business.persistence</defaultPackage>
@@ -109,7 +146,7 @@
                         <scope>compile</scope>
                     </dependency>
                 </dependencies>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java	2010-02-18 18:57:57 UTC (rev 2874)
@@ -72,6 +72,11 @@
                 if (pollAccountEntity == null) {
                     log.debug("Nouveau compte associé au vote");
                     pollAccountEntity = pollAccountDAO.create();
+                    // EVO #108 : Migration to ToPIA 2.3, the entity must be 
+                    // commited because an other findBy is called in the 
+                    // converter (wtf ?! :/). This behavior doesn't work
+                    // anymore.
+                    transaction.commitTransaction();
 //                     voteDTO.setPollAccountId(spa
 //                            .createPollAccount(pollAccountDTO));
                 } else {

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
         <property name="description" type="text" access="field" column="description" node="description"/>
         <property name="validate" type="java.lang.Boolean" access="field" column="validate" node="validate"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
     </class>
 </hibernate-mapping>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="text" type="text" access="field" column="text" node="text"/>
         <property name="postDate" type="java.util.Date" access="field" column="postDate" node="postDate"/>
         <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll"  node="poll/@topiaId" embed-xml="false"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
         <many-to-one name="owner" class="org.chorem.pollen.business.persistence.UserAccountImpl" column="owner"  node="owner/@topiaId" embed-xml="false"/>
         <bag name="pollAccount" inverse="true" lazy="true" node="pollAccount" embed-xml="false">

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/>
         <property name="hasVoted" type="java.lang.Boolean" access="field" column="hasVoted" node="hasVoted"/>
         <many-to-one name="votingList" class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" node="votingList/@topiaId" embed-xml="false"  />

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="accountId" type="text" access="field" column="accountId" node="accountId"/>
         <property name="votingId" type="text" access="field" column="votingId" node="votingId"/>
         <property name="email" type="text" access="field" column="email" node="email"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="pollId" type="text" access="field" column="pollId" node="pollId"/>
         <property name="title" type="text" access="field" column="title" node="title"/>
         <property name="description" type="text" access="field" column="description" node="description"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
     </class>
 </hibernate-mapping>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="scope" type="text" access="field" column="scope" node="scope"/>
         <property name="sensibility" type="java.lang.Integer" access="field" column="sensibility" node="sensibility"/>
         <property name="repeated" type="java.lang.Boolean" access="field" column="repeated" node="repeated"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
         <property name="ResultValue" type="text" access="field" column="resultValue" node="ResultValue"/>
         <property name="byGroup" type="java.lang.Boolean" access="field" column="byGroup" node="byGroup"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="login" type="text" access="field" column="login" node="login"/>
         <property name="password" type="text" access="field" column="password" node="password"/>
         <property name="firstName" type="text" access="field" column="firstName" node="firstName"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
     </class>
 </hibernate-mapping>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/>
         <property name="comment" type="text" access="field" column="comment" node="comment"/>
         <property name="anonymous" type="java.lang.Boolean" access="field" column="anonymous" node="anonymous"/>

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="voteValue" type="java.lang.Integer" access="field" column="voteValue" node="voteValue"/>
         <many-to-one name="vote" class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" node="vote/@topiaId" embed-xml="false"  />
         <many-to-one name="choice" class="org.chorem.pollen.business.persistence.ChoiceImpl" column="choice" node="choice/@topiaId" embed-xml="false"  />

Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml
===================================================================
--- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -4,7 +4,7 @@
     <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" >
         <id name="topiaId" type="string" length="255" node="@topiaId"/>
         <version name="topiaVersion" type="long" node="@topiaVersion"/>
-        <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/>
+        <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
         <property name="name" type="text" access="field" column="name" node="name"/>
         <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/>
         <bag name="pollAccountPersonToList" inverse="true" lazy="true" cascade="all,delete-orphan" node="pollAccountPersonToList" embed-xml="false">

Modified: trunk/pollen-ui/pom.xml
===================================================================
--- trunk/pollen-ui/pom.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-ui/pom.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.chorem</groupId>
         <artifactId>pollen</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.chorem.pollen</groupId>

Modified: trunk/pollen-votecounting/pom.xml
===================================================================
--- trunk/pollen-votecounting/pom.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pollen-votecounting/pom.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.chorem</groupId>
         <artifactId>pollen</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.chorem.pollen</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-02-18 15:49:21 UTC (rev 2873)
+++ trunk/pom.xml	2010-02-18 18:57:57 UTC (rev 2874)
@@ -15,7 +15,7 @@
 
     <groupId>org.chorem</groupId>
     <artifactId>pollen</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <modules>
         <module>pollen-ui</module>
@@ -71,13 +71,13 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.8</version>
+                <version>1.5.10</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.8</version>
+                <version>1.5.10</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
@@ -294,10 +294,10 @@
 
         <!-- customized versions -->
         <!--javadoc.version>2.4</javadoc.version-->
-        <topia.version>2.2.2</topia.version>
-        <eugene.version>1.0.1</eugene.version>
+        <topia.version>2.3.0-beta-8</topia.version>
+        <eugene.version>2.0.0-beta-4</eugene.version>
         <tapestry.version>5.1.0.5</tapestry.version>
-        <nuiton-utils.version>1.1.2</nuiton-utils.version>
+        <nuiton-utils.version>1.1.3</nuiton-utils.version>
 
         <!--Multilanguage maven-site -->
         <siteLocales>en,fr</siteLocales>
@@ -328,7 +328,23 @@
                     <artifactId>jetty-maven-plugin</artifactId>
                     <version>7.0.1.v20091125</version>
                 </plugin>
-
+                <!-- EUGene plugin for entities generation -->
+                <plugin>
+                    <groupId>org.nuiton.eugene</groupId>
+                    <artifactId>maven-eugene-plugin</artifactId>
+                    <version>${eugene.version}</version>
+                    <configuration>
+                        <inputs>zargo</inputs>
+                        <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
+                    </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.nuiton.topia</groupId>
+                            <artifactId>topia-persistence</artifactId>
+                            <version>${topia.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>

    

r2874 - in trunk: . pollen-business pollen-business/src/main/java/org/chorem/pollen/business/services pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence pollen-ui pollen-votecounting

fdesbois＠users.chorem.org

tags

participants (1)