Author: tchemit Date: 2013-12-03 19:25:15 +0100 (Tue, 03 Dec 2013) New Revision: 2911 Url: http://nuiton.org/projects/topia/repository/revisions/2911 Log: fix it, add third parties Added: trunk/topia-it/src/it/ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java trunk/topia-it/src/license/ trunk/topia-it/src/license/THIRD-PARTY.properties trunk/topia-junit/src/license/ trunk/topia-junit/src/license/THIRD-PARTY.properties trunk/topia-templates/src/license/ trunk/topia-templates/src/license/THIRD-PARTY.properties Removed: trunk/topia-persistence/src/it/ Modified: trunk/topia-it/pom.xml trunk/topia-it/src/it/ANOMALIE-1640/pom.xml trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-persistence/pom.xml Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-03 17:32:11 UTC (rev 2910) +++ trunk/topia-it/pom.xml 2013-12-03 18:25:15 UTC (rev 2911) @@ -161,4 +161,66 @@ </plugins> </build> + <profiles> + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + <!-- Reuse this when MINVOKER-107 will be done (syas invoker 1.6 --> + <!--name>maven.test.skip</name> + <value>!false</value--> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <localRepositoryPath> + ${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- reporting at release time --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>${invokerPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> + </project> Modified: trunk/topia-it/src/it/ANOMALIE-1640/pom.xml =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2013-12-03 17:32:11 UTC (rev 2910) +++ trunk/topia-it/src/it/ANOMALIE-1640/pom.xml 2013-12-03 18:25:15 UTC (rev 2911) @@ -30,36 +30,20 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>3.0.3</version> - </parent> - <groupId>org.nuiton.topia</groupId> <artifactId>topia-test-ANOMALIE-1640</artifactId> <version>@pom.version@</version> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Topia :: ANOMALIE-1640</name> <description>Module de test pour Topia avec entités abstraites</description> <url>http://nuiton.org/issues/1640</url> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> <properties> - <eugeneVersion>@eugeneVersion@</eugeneVersion> - <hibernateVersion>@hibernateVersion@</hibernateVersion> - <slf4jVersion>@sl4jVersion@</slf4jVersion> - <h2Version>@h2Version@</h2Version> + <eugeneVersion>2.7.3</eugeneVersion> + <hibernateVersion>4.2.7.SP1</hibernateVersion> + <slf4jVersion>1.7.5</slf4jVersion> + <h2Version>1.3.172</h2Version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> @@ -68,16 +52,21 @@ <artifactId>topia-persistence</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> + <groupId>${project.groupId}</groupId> + <artifactId>topia-junit</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>${h2Version}</version> + <scope>test</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> @@ -95,12 +84,15 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> </dependency> </dependencies> @@ -125,7 +117,7 @@ <!-- DefaultPackage used for DAOHelper generation --> <defaultPackage>org.nuiton.topia.testabstract</defaultPackage> <templates> - org.nuiton.topia.generator.TopiaMetaTransformer + org.nuiton.topia.templates.TopiaMetaTransformer </templates> </configuration> <goals> @@ -133,6 +125,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-templates</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-12-03 17:32:11 UTC (rev 2910) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-12-03 18:25:15 UTC (rev 2911) @@ -24,24 +24,23 @@ */ package org.nuiton.topia.testabstract; +import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContextFactory; public class TopiaAbstractTest { + @Rule + public final TopiaDatabase db = new TopiaDatabase(); + @Test public void testCreateCar() { - TopiaContext context = TopiaContextFactory.getContext(); - try { - TopiaContext transaction = context.beginTransaction(); + TopiaTestAbstractTopiaPersistenceContext persistenceContext = + db.getApplicationContext().newPersistenceContext(); - CarDAO carDAO = TopiaTestAbstractDAOHelper.getCarDAO(transaction); - carDAO.create(); - transaction.commit(); - } finally { - context.closeContext(); - } + CarTopiaDao carDAO = persistenceContext.getCarDao(); + carDAO.create(); + persistenceContext.commit(); } } Added: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java =================================================================== --- trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java (rev 0) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java 2013-12-03 18:25:15 UTC (rev 2911) @@ -0,0 +1,48 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-it/src/test/java/org/nuiton/topi... $ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * 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.testabstract; + +import org.nuiton.topia.junit.AbstractDatabaseResource; + +import java.util.Properties; + +public class TopiaDatabase extends AbstractDatabaseResource<TopiaTestAbstractTopiaPersistenceContext, TopiaTestAbstractTopiaApplicationContext> { + + public TopiaDatabase() { + super("/TopiaContextImpl.properties"); + } + + @Override + protected TopiaTestAbstractTopiaApplicationContext createApplicationContext(Properties dbConfiguration) { + return new TopiaTestAbstractTopiaApplicationContext(dbConfiguration); + } + + @Override + protected String getImplementationClassesAsString() { + return TopiaTestAbstractEntityEnum.getImplementationClassesAsString(); + } + +} + Property changes on: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/topia-it/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-it/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-it/src/license/THIRD-PARTY.properties 2013-12-03 18:25:15 UTC (rev 2911) @@ -0,0 +1,28 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Dec 03 18:48:59 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License Property changes on: trunk/topia-it/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/topia-junit/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-junit/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-junit/src/license/THIRD-PARTY.properties 2013-12-03 18:25:15 UTC (rev 2911) @@ -0,0 +1,28 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Dec 03 18:48:40 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License Property changes on: trunk/topia-junit/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-03 17:32:11 UTC (rev 2910) +++ trunk/topia-persistence/pom.xml 2013-12-03 18:25:15 UTC (rev 2911) @@ -136,71 +136,4 @@ </dependencies> - <build> - - </build> - - <profiles> - - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - <!-- Reuse this when MINVOKER-107 will be done (syas invoker 1.6 --> - <!--name>maven.test.skip</name> - <value>!false</value--> - </property> - </activation> - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <localRepositoryPath> - ${basedir}/target/local-repo - </localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> - <debug>${maven.verbose}</debug> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- reporting at release time --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>${invokerPluginVersion}</version> - </plugin> - </plugins> - </reporting> - - </profile> - - </profiles> </project> Added: trunk/topia-templates/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-templates/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-templates/src/license/THIRD-PARTY.properties 2013-12-03 18:25:15 UTC (rev 2911) @@ -0,0 +1,31 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - Apache License Version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - Mozilla Public License Version 1.0 +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - http://jaxen.codehaus.org/license.html +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Dec 03 18:48:47 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License Property changes on: trunk/topia-templates/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native