October 2010 - Topia-commits - mailman.cloud.codelutin.com

r2132 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:29:42 +0200 (Fri, 29 Oct 2010) New Revision: 2132 Url: http://nuiton.org/repositories/revision/topia/2132 Log: Update mavenpom4redmineAndCentral to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:58:49 UTC (rev 2131) +++ trunk/pom.xml 2010-10-29 08:29:42 UTC (rev 2132) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2131 - trunk
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 14:58:49 +0200 (Tue, 26 Oct 2010) New Revision: 2131 Url: http://nuiton.org/repositories/revision/topia/2131 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:07:00 UTC (rev 2130) +++ trunk/pom.xml 2010-10-26 12:58:49 UTC (rev 2131) @@ -60,6 +60,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> @@ -78,7 +79,7 @@ </dependency> - <dependency> +  <dependency> <groupId>org.hibernate</groupId> @@ -125,11 +126,11 @@ <scope>test</scope> </dependency> - <dependency> +  <!-- All theses dependancies are no more used Keep them for topia-soa and topia-service-XXX

1 0

r2130 - trunk
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 14:07:00 +0200 (Tue, 26 Oct 2010) New Revision: 2130 Url: http://nuiton.org/repositories/revision/topia/2130 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:46 UTC (rev 2129) +++ trunk/pom.xml 2010-10-26 12:07:00 UTC (rev 2130) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -60,21 +60,20 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> <scope>test</scope> </dependency> <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> @@ -82,28 +81,24 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> + <version>${hibernateVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <version>${hibernate.version}</version> + <version>${hibernateVersion}</version> <scope>runtime</scope> </dependency> @@ -133,7 +128,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -144,14 +138,14 @@  @@ -327,12 +321,12 @@ <projectId>topia</projectId>  - <eugene.version>2.2</eugene.version> - <lutinutil.version>1.4.2</lutinutil.version> - <processor.version>1.0.3</processor.version> - <i18n.version>1.2.2</i18n.version> - <xmlrpc.version>3.1.2</xmlrpc.version> - <hibernate.version>3.3.2.GA</hibernate.version> + <eugeneVersion>2.2</eugeneVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <processorPluginVersion>1.0.3</processorPluginVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> + <hibernateVersion>3.3.2.GA</hibernateVersion> </properties> @@ -344,7 +338,7 @@ <plugin> <groupId>org.nuiton.processor</groupId> <artifactId>maven-processor-plugin</artifactId> - <version>${processor.version}</version> + <version>${processorPluginVersion}</version> <executions> <execution> <phase>generate-sources</phase> @@ -365,7 +359,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> @@ -375,7 +369,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <plugin> @@ -384,7 +378,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

r2129 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:38:46 +0200 (Sun, 17 Oct 2010) New Revision: 2129 Url: http://nuiton.org/repositories/revision/topia/2129 Log: Update mavenpom4redmineAndCentral to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:51:01 UTC (rev 2128) +++ trunk/pom.xml 2010-10-17 01:38:46 UTC (rev 2129) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>topia</artifactId>

1 0

r2128 - trunk
by tchemit＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: tchemit Date: 2010-10-09 01:51:01 +0200 (Sat, 09 Oct 2010) New Revision: 2128 Url: http://nuiton.org/repositories/revision/topia/2128 Log: Update mavenpom4redmineAndCentral to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-05 09:06:29 UTC (rev 2127) +++ trunk/pom.xml 2010-10-08 23:51:01 UTC (rev 2128) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>topia</artifactId>

1 0

r2127 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: echatellier Date: 2010-10-05 11:06:29 +0200 (Tue, 05 Oct 2010) New Revision: 2127 Url: http://nuiton.org/repositories/revision/topia/2127 Log: Fix test Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2010-10-05 08:42:08 UTC (rev 2126) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2010-10-05 09:06:29 UTC (rev 2127) @@ -96,6 +96,7 @@ // recherce la personne créée dans la même transaction Person person2 = personDAO.create(); person2.setName("titi"); + allPerson = personDAO.findAll(); Assert.assertEquals(2, allPerson.size()); Assert.assertThat(allPerson, JUnitMatchers.hasItem(person2));

1 0

r2126 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: echatellier Date: 2010-10-05 10:42:08 +0200 (Tue, 05 Oct 2010) New Revision: 2126 Url: http://nuiton.org/repositories/revision/topia/2126 Log: Add test about findAll() to find entities created during non commited transaction Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2010-10-05 08:42:08 UTC (rev 2126) @@ -0,0 +1,114 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.topia.persistence; + +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.junit.matchers.JUnitMatchers; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.framework.TopiaUtilTest; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.util.Resource; + +/** + * Test on {@link TopiaDAO}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TopiaDAOTest { + + private static final Log log = LogFactory.getLog(TopiaUtilTest.class); + + protected TopiaContext getRootContext() throws TopiaException, IOException { + Properties conf = new Properties(); + URL url = Resource.getURL("TopiaContextImpl.properties"); + if (log.isDebugEnabled()) { + log.debug(url); + } + conf.load(url.openStream()); + conf.setProperty("hibernate.connection.url", "jdbc:h2:file://tmp/topiautiltest_" + System.currentTimeMillis()); + conf.setProperty("topia.persistence.classes", TopiaTestDAOHelper.getImplementationClassesAsString()); + + TopiaContext rootContext = (TopiaContext) TopiaContextFactory.getContext(conf); + return rootContext; + } + + /** + * Test de creer une entité et de verifier qu'elle est + * présente dans la persistence au sein de la transaction. + * + * @throws TopiaException + * @throws IOException + */ + @Test + public void testCreateAndFindInTransaction() throws TopiaException, IOException { + + TopiaContext rootContext = getRootContext(); + TopiaContext context = rootContext.beginTransaction(); + + PersonDAO personDAO = TopiaTestDAOHelper.getPersonDAO(context); + + // appel 1 find all + Person person = personDAO.create(); + person.setName("toto"); + List<Person> allPerson = personDAO.findAll(); + Assert.assertEquals(1, allPerson.size()); + context.commitTransaction(); + + // recherce la personne créée dans la même transaction + Person person2 = personDAO.create(); + person2.setName("titi"); + Assert.assertEquals(2, allPerson.size()); + Assert.assertThat(allPerson, JUnitMatchers.hasItem(person2)); + + context.rollbackTransaction(); + + // meme test apres roolback + Person person3 = personDAO.create(); + person3.setName("tata"); + allPerson = personDAO.findAll(); + Assert.assertEquals(2, allPerson.size()); + Assert.assertThat(allPerson, JUnitMatchers.hasItem(person3)); + + context.commitTransaction(); + rootContext.closeContext(); + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2125 - trunk
by tchemit＠users.nuiton.org Oct. 3, 2010

Oct. 3, 2010

Author: tchemit Date: 2010-10-03 17:53:48 +0200 (Sun, 03 Oct 2010) New Revision: 2125 Url: http://nuiton.org/repositories/revision/topia/2125 Log: Update mavenpom4redmineAndCentral to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 12:45:58 UTC (rev 2124) +++ trunk/pom.xml 2010-10-03 15:53:48 UTC (rev 2125) @@ -32,8 +32,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.3</version> </parent> <artifactId>topia</artifactId> @@ -333,17 +333,6 @@ <i18n.version>1.2.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> - -  - -  - <arguments>-DperformRelease -Pcentral-safe</arguments> - -  - <releaseProfiles>central-safe</releaseProfiles> - -  - <release.repository>${central.release.repository}</release.repository> </properties>

1 0