Author: tchemit Date: 2009-12-19 17:10:25 +0100 (Sat, 19 Dec 2009) New Revision: 2683 Modified: trunk/callao-entity/ trunk/callao-entity/pom.xml trunk/callao-service/ trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java trunk/pom.xml Log: add (in comment config for eugene-2.0.0) + clean poms and fix nuiton-utils dependency Property changes on: trunk/callao-entity ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project *.ipr *.iws *.iml + *.ipr *.iws *.iml .classpath .project target .settings Modified: trunk/callao-entity/pom.xml =================================================================== --- trunk/callao-entity/pom.xml 2009-12-18 13:38:43 UTC (rev 2682) +++ trunk/callao-entity/pom.xml 2009-12-19 16:10:25 UTC (rev 2683) @@ -56,13 +56,8 @@ <phase>process-sources</phase> <!--Configuration of model generator--> <configuration> - <addCompileDirectory>true</addCompileDirectory> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.chorem.callao.entity</defaultPackage> <extractedPackages>org.chorem.callao.entity</extractedPackages> </configuration> @@ -73,14 +68,22 @@ </goals> </execution> + <!-- config for eugene 2.0.0 --> + <!--execution> + <phase>process-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> + <defaultPackage>org.chorem.callao.entity</defaultPackage> + <fullPackagePath>org.chorem.callao.entity</fullPackagePath> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution--> </executions> - <!--dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - </dependencies--> </plugin> </plugins> </build> Property changes on: trunk/callao-service ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project *.ipr *.iws *.iml + *.iml *.ipr *.iws .classpath .project target .settings Modified: trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java =================================================================== --- trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java 2009-12-18 13:38:43 UTC (rev 2682) +++ trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java 2009-12-19 16:10:25 UTC (rev 2683) @@ -429,6 +429,7 @@ // Recherche les deux entry en format DTO List<EntryDTO> listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); Assert.assertEquals(2,listEntryDTO.size()); + Assert.assertTrue(listEntryDTO.size()>0); // Premier DTO EntryDTO entryDTO = listEntryDTO.get(0); entryDTO.setAmount("800"); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 13:38:43 UTC (rev 2682) +++ trunk/pom.xml 2009-12-19 16:10:25 UTC (rev 2683) @@ -111,6 +111,7 @@ <platform>chorem.org</platform> <projectId>callao</projectId> + <!-- WHY ? should fixig breaking tests --> <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> <!-- customized versions --> @@ -118,6 +119,10 @@ <topia.version>2.2.0</topia.version> <eugene.version>1.0.0</eugene.version> + <!-- config for eugene 2.0.0 --> + <!--<topia.version>2.3.0-beta-2-SNAPSHOT</topia.version>--> + <!--<eugene.version>2.0.0-beta-2-SNAPSHOT</eugene.version>--> + <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName>