Author: tchemit Date: 2012-05-09 20:38:07 +0200 (Wed, 09 May 2012) New Revision: 2463 Url: http://nuiton.org/repositories/revision/topia/2463 Log: - mise en place de configuration sp?\195?\169ar?\195?\169e pour les 3 mod?\195?\168les de tests - suppression des configuration inutiles dans le module topia-persistence-tck Added: trunk/topia-persistence-hibernate/src/test/resources/ trunk/topia-persistence-hibernate/src/test/resources/TopiaConnectionProviderHardcoded.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties trunk/topia-persistence-hibernate/src/test/resources/log4j.properties trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java Removed: trunk/topia-persistence-tck/src/main/resources/TopiaConnectionProviderHardcoded.properties trunk/topia-persistence-tck/src/main/resources/TopiaContextImpl.properties trunk/topia-persistence-tck/src/main/resources/i18n/ trunk/topia-persistence-tck/src/main/resources/log4j.properties trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/test/ Modified: trunk/topia-persistence-hibernate/pom.xml trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence-tck/pom.xml trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence/pom.xml 2012-05-09 18:38:07 UTC (rev 2463) @@ -40,6 +40,9 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> + <name>ToPIA :: Persistence</name> + <description>JPA based persistence module</description> + <dependencies> <dependency> @@ -108,6 +111,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jpa_2.0_spec</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -139,46 +143,8 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Persistence</name> - <description>JPA based persistence module</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> - <testResources> - - <testResource> - <directory>${maven.gen.dir}/test-java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - </testResources> - <plugins> <plugin> @@ -225,49 +191,6 @@ </executions> </plugin> - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <configuration> - - </configuration> - <executions> - <execution> - <id>Test Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.EntityDTOTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <defaultPackage>org.nuiton.topia</defaultPackage> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin--> - - <!-- expose tests --> - <!--plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - - </plugin--> </plugins> </build> @@ -276,9 +199,9 @@ <!-- ************************************************************* --> <profiles> - <!-- perform only on a release stage when using the maven-release-plugin --> + <!-- reporting at release time --> <profile> - <id>release-profile</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -286,49 +209,28 @@ </property> </activation> - <build> + <reporting> <plugins> - - <!-- always expose tests source jar --> <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>${plexusPluginVersion}</version> </plugin> - - <!-- always expose tests javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </reporting> + </profile> - <profile> + <!--profile> <id>run-its</id> <activation> <property> <name>performRelease</name> - <value>true</value> + <value>true</value--> <!-- Reuse this when MINVOKER-107 will be done (syas invoker 1.6 --> <!--name>maven.test.skip</name> <value>!false</value--> - </property> + <!--/property> </activation> <build> <defaultGoal>integration-test</defaultGoal> @@ -354,30 +256,8 @@ </plugin> </plugins> </build> - </profile> - - <!-- reporting at release time --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + </profile--> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> - - </profile> - </profiles> </project> Modified: trunk/topia-persistence-hibernate/pom.xml =================================================================== --- trunk/topia-persistence-hibernate/pom.xml 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-hibernate/pom.xml 2012-05-09 18:38:07 UTC (rev 2463) @@ -17,9 +17,31 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence-hibernate</artifactId> + <name>ToPIA :: Persistence :: Hibernate</name> + <description>Hibernate based persistence module</description> + <dependencies> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <!--exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + </exclusion> + </exclusions--> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence-tck</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> @@ -37,18 +59,6 @@ <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- BD H2 for testing --> <dependency> <groupId>com.h2database</groupId> @@ -66,88 +76,14 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence-tck</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>ToPIA :: Persistence :: Hibernate</name> - <description>Hibernate based persistence module</description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> - <testResources> - - <testResource> - <directory>${maven.gen.dir}/test-java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.src.dir}/test/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - </testResources> - <plugins> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - <!-- restrict parsing beacause this is expensive --> - <!-- if you want to parse more, add your package in includes --> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <include>org/nuiton/topia/framework/*.java</include> - </includes> - </entry> - </entries> - </configuration> - </execution> - </executions> - </plugin> - <!-- expose new plexus components --> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -160,160 +96,7 @@ </execution> </executions> </plugin> - - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <configuration> - - </configuration> - <executions> - <execution> - <id>Test Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.EntityDTOTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <defaultPackage>org.nuiton.topia</defaultPackage> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin--> - - <!-- expose tests --> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - - </plugin> </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <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 expose tests source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always expose tests javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - <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> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> - - </profile> - - </profiles> - </project> Modified: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -30,12 +30,13 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.TopiaDatabase; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.it.Personne; -import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; +import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; +import org.nuiton.topia.tck.legacy.entities.Person; +import org.nuiton.topia.tck.legacy.entities.PersonDAO; import java.io.File; import java.util.Locale; @@ -59,7 +60,7 @@ @Rule public final TopiaDatabase db = - new TopiaDatabase("/TopiaConnectionProviderHardcoded.properties") { + new TopiaDatabaseLegacy("/TopiaConnectionProviderHardcoded.properties") { @Override protected void onDbConfigurationCreate(Properties configuration, @@ -127,7 +128,7 @@ TopiaContext transaction = db.beginTransaction(); try { - PersonDAO dao = TopiaTckItDAOHelper.getPersonDAO(transaction); + PersonDAO dao = TopiaTckLegacyDAOHelper.getPersonDAO(transaction); Person personne = dao.create(Personne.PROPERTY_NAME, "Jack Bauer"); transaction.commitTransaction(); Copied: trunk/topia-persistence-hibernate/src/test/resources/TopiaConnectionProviderHardcoded.properties (from rev 2462, trunk/topia-persistence-tck/src/main/resources/TopiaConnectionProviderHardcoded.properties) =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaConnectionProviderHardcoded.properties (rev 0) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaConnectionProviderHardcoded.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,37 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### +# Proprietes par defaut pour une base de donnees de type H2 +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect + +topia.connection.username=sa +topia.connection.password= +topia.connection.driver_class=org.h2.Driver + +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProviderHardCoded +# tchemit 2010-11-28 : comment this line, each test must define his own db path +#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data \ No newline at end of file Property changes on: trunk/topia-persistence-hibernate/src/test/resources/TopiaConnectionProviderHardcoded.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties (rev 0) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,9 @@ +# Proprietes par defaut pour une base de donnees de type H2 et le model it +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect + +topia.connection.username=sa +topia.connection.password= +topia.connection.driver_class=org.h2.Driver \ No newline at end of file Added: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties (rev 0) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,9 @@ +# Proprietes par defaut pour une base de donnees de type H2 et le model legacy +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect + +topia.connection.username=sa +topia.connection.password= +topia.connection.driver_class=org.h2.Driver \ No newline at end of file Added: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties (rev 0) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,9 @@ +# Proprietes par defaut pour une base de donnees de type H2 et le model mapping +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect + +topia.connection.username=sa +topia.connection.password= +topia.connection.driver_class=org.h2.Driver \ No newline at end of file Copied: trunk/topia-persistence-hibernate/src/test/resources/log4j.properties (from rev 2462, trunk/topia-persistence-tck/src/main/resources/log4j.properties) =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/log4j.properties (rev 0) +++ trunk/topia-persistence-hibernate/src/test/resources/log4j.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,36 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### +#\u00a0This log is used to display trace in generation + +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.nuiton.topia=INFO +#log4j.logger.org.nuiton.topiatest=DEBUG +log4j.logger.org.nuiton.topia.persistence.util=INFO Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/pom.xml 2012-05-09 18:38:07 UTC (rev 2463) @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> @@ -17,7 +15,9 @@ <artifactId>topia-persistence-tck</artifactId> <name>ToPIA :: Persistence :: Test Compatibility Kit</name> - <description>Tests to be shared between topia-persistence implementations</description> + <description> + Tests to be shared between topia-persistence implementations + </description> <dependencies> @@ -27,6 +27,11 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <!-- BD H2 for testing --> <dependency> <groupId>com.h2database</groupId> @@ -75,7 +80,8 @@ <id>Test Generator (itk)</id> <phase>generate-sources</phase> <configuration> - <inputs>target/generated-sources/models:topia-tck-it.objectmodel</inputs> + <inputs>target/generated-sources/models:topia-tck-it.objectmodel + </inputs> <templates> org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, @@ -95,7 +101,9 @@ <id>Test Generator (legacy)</id> <phase>generate-sources</phase> <configuration> - <inputs>target/generated-sources/models:topia-tck-legacy.objectmodel</inputs> + <inputs> + target/generated-sources/models:topia-tck-legacy.objectmodel + </inputs> <templates> org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, @@ -118,7 +126,9 @@ <templates> org.nuiton.topia.generator.TopiaMetaTransformer </templates> - <inputs>target/generated-sources/models:topia-tck-mapping.objectmodel</inputs> + <inputs> + target/generated-sources/models:topia-tck-mapping.objectmodel + </inputs> <fullPackagePath>org.nuiton.topia.tck.mapping</fullPackagePath> <defaultPackage>org.nuiton.topia.tck.mapping</defaultPackage> </configuration> @@ -128,130 +138,7 @@ </execution> </executions> </plugin> - - <!-- expose tests --> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - - </plugin> </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <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 expose tests source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always expose tests javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - <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> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> - - </profile> - - </profiles> - </project> Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -31,7 +31,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.persistence.TopiaEntity; import java.io.File; import java.io.InputStream; @@ -62,7 +62,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.6.8 */ -public class TopiaDatabase extends TestWatcher { +public abstract class TopiaDatabase extends TestWatcher { /** Logger. */ private static final Log log = LogFactory.getLog(TopiaDatabase.class); @@ -86,6 +86,14 @@ this.configurationPath = configurationPath; } + /** + * Obtain all types persisted in this db. + * + * @return all persisted types in this db. + * @since 3.0 + */ + protected abstract Class<? extends TopiaEntity>[] getImplementationClasses(); + @Override protected void starting(Description description) { @@ -112,7 +120,7 @@ } dbConfiguration.setProperty( TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, - TopiaTckItDAOHelper.getImplementationClassesAsString()); + getImplementationClassesAsString()); // make sure we always use a different directory @@ -171,6 +179,14 @@ } + protected final String getImplementationClassesAsString() { + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + } + public static File getTestSpecificDirectory(Class<?> testClassName, String methodName) { // Trying to look for the temporary folder to store data for the test String tempDirPath = System.getProperty("java.io.tmpdir"); Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/EnumTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -39,7 +39,7 @@ public class EnumTest { @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseIt(); /** * Create an entity having two field of type enumeration. One is stored Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,27 @@ +package org.nuiton.topia.tck.it; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.tck.TopiaDatabase; + +/** + * Concrete topia database for {@code it} model. + * + * @author tchemit <chemit@codelutin.com> + * @since 3.0 + */ +public class TopiaDatabaseIt extends TopiaDatabase { + + public TopiaDatabaseIt() { + super("/TopiaContext-it.properties"); + } + + public TopiaDatabaseIt(String configurationPath) { + super(configurationPath); + } + + @Override + protected Class<? extends TopiaEntity>[] getImplementationClasses() { + return TopiaTckItDAOHelper.getImplementationClasses(); + } + +} Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/DeleteEntityTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -44,6 +44,8 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.generator.EntityDAOTransformer; +import org.nuiton.topia.tck.it.TopiaDatabaseIt; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.Personne; @@ -65,7 +67,7 @@ private static final Log log = LogFactory.getLog(DeleteEntityTest.class); @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseIt(); /** * Test for deleting entities with inheritance. Delete from the DAO linked @@ -125,7 +127,7 @@ * two entities have both inheritance. * * @throws TopiaException if any exception while manipulating db - * @see DAOAbstractTransformer + * @see EntityDAOTransformer */ @Test public void testDeleteEntityWithManyToManyRelation() throws TopiaException { Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,27 @@ +package org.nuiton.topia.tck.legacy; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.tck.TopiaDatabase; + +/** + * Concrete topia database for {@code it} model. + * + * @author tchemit <chemit@codelutin.com> + * @since 3.0 + */ +public class TopiaDatabaseLegacy extends TopiaDatabase { + + public TopiaDatabaseLegacy() { + super("/TopiaContext-legacy.properties"); + } + + public TopiaDatabaseLegacy(String configurationPath) { + super(configurationPath); + } + + @Override + protected Class<? extends TopiaEntity>[] getImplementationClasses() { + return TopiaTckLegacyDAOHelper.getImplementationClasses(); + } + +} Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1882/DAOAbstractTransformerTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -29,6 +29,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; import java.util.Arrays; @@ -36,7 +37,7 @@ public class DAOAbstractTransformerTest { @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); @Test public void testAno1882() throws Exception { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/ano1991/TopiaQueryTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -32,6 +32,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; import org.nuiton.topia.tck.legacy.entities.Person; import org.nuiton.topia.tck.legacy.entities.PersonDAO; @@ -50,7 +51,7 @@ public class TopiaQueryTest { @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); @Test public void testInOperatorForIds() throws TopiaException { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaContextReplicateTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -30,6 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.tck.TopiaDatabase; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; import org.nuiton.topia.tck.legacy.TopiaTckLegacyDAOHelper; import org.nuiton.topia.tck.legacy.entities.Person; import org.nuiton.topia.tck.legacy.entities.PersonDAO; @@ -49,7 +50,7 @@ @Rule public final TopiaDatabase dbSource = - new TopiaDatabase() { + new TopiaDatabaseLegacy() { @Override protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { @@ -61,7 +62,7 @@ @Rule public final TopiaDatabase dbTarget = - new TopiaDatabase() { + new TopiaDatabaseLegacy() { @Override protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -31,6 +31,7 @@ import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.Personne; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; import org.nuiton.topia.tck.legacy.entities.PersonImpl; import java.util.regex.Matcher; @@ -56,7 +57,7 @@ protected static final String PERSON_ID2 = "org.nuiton.topia.tck.it.Personne#1226701039001#0.6502325993664999"; @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); @Test public void testGetTopiaIdPattern() throws Exception { Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/generator/TopiaTestCase.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -38,6 +38,7 @@ import org.nuiton.topia.tck.it.CompanyDAO; import org.nuiton.topia.tck.it.Department; import org.nuiton.topia.tck.it.DepartmentDAO; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; /** * TopiaTestCase. @@ -54,7 +55,7 @@ private final static Log log = LogFactory.getLog(TopiaTestCase.class); @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); // /** Proprietes */ // protected static Properties config; Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/EntityVisitorExportXmlTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -44,6 +44,7 @@ import org.nuiton.topia.tck.it.DepartmentDAO; import org.nuiton.topia.tck.it.Employe; import org.nuiton.topia.tck.it.EmployeDAO; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; /** * Test de visitor. @@ -60,7 +61,7 @@ LogFactory.getLog(EntityVisitorExportXmlTest.class); @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); /** * Prepare test. Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/legacy/persistence/NaturalIdTest.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -36,6 +36,7 @@ import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.tck.it.NaturalizedEntity; import org.nuiton.topia.tck.it.NaturalizedEntityDAO; +import org.nuiton.topia.tck.legacy.TopiaDatabaseLegacy; import javax.persistence.PersistenceException; @@ -55,7 +56,7 @@ private static final Log log = LogFactory.getLog(NaturalIdTest.class); @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseLegacy(); @Test public void testCreateSucessfull() throws Exception { Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -0,0 +1,27 @@ +package org.nuiton.topia.tck.mapping; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.tck.TopiaDatabase; + +/** + * Concrete topia database for {@code mapping} model. + * + * @author tchemit <chemit@codelutin.com> + * @since 3.0 + */ +public class TopiaDatabaseMapping extends TopiaDatabase { + + public TopiaDatabaseMapping() { + super("/TopiaContext-mapping.properties"); + } + + public TopiaDatabaseMapping(String configurationPath) { + super(configurationPath); + } + + @Override + protected Class<? extends TopiaEntity>[] getImplementationClasses() { + return TopiaTckMappingDAOHelper.getImplementationClasses(); + } + +} Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test1/Test1.java 2012-05-09 18:38:07 UTC (rev 2463) @@ -5,6 +5,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.tck.TopiaDatabase; +import org.nuiton.topia.tck.mapping.TopiaDatabaseMapping; /** * TODO @@ -15,7 +16,7 @@ public class Test1 { @Rule - public final TopiaDatabase db = new TopiaDatabase(); + public final TopiaDatabase db = new TopiaDatabaseMapping(); /** Case 1 : simple OneToMany relation using class A1 -> B1. */ @Test Deleted: trunk/topia-persistence-tck/src/main/resources/TopiaConnectionProviderHardcoded.properties =================================================================== --- trunk/topia-persistence-tck/src/main/resources/TopiaConnectionProviderHardcoded.properties 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/resources/TopiaConnectionProviderHardcoded.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -1,37 +0,0 @@ -### -# #%L -# ToPIA :: Persistence -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 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% -### -# Proprietes par defaut pour une base de donnees de type H2 -hibernate.hbm2ddl.auto=update -hibernate.show_sql=false - -hibernate.dialect=org.hibernate.dialect.H2Dialect - -topia.connection.username=sa -topia.connection.password= -topia.connection.driver_class=org.h2.Driver - -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProviderHardCoded -# tchemit 2010-11-28 : comment this line, each test must define his own db path -#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data \ No newline at end of file Deleted: trunk/topia-persistence-tck/src/main/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-persistence-tck/src/main/resources/TopiaContextImpl.properties 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/resources/TopiaContextImpl.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -1,35 +0,0 @@ -### -# #%L -# ToPIA :: Persistence -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 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% -### -# Proprietes par defaut pour une base de donnees de type H2 -hibernate.hbm2ddl.auto=update -hibernate.show_sql=false - -hibernate.dialect=org.hibernate.dialect.H2Dialect - -topia.connection.username=sa -topia.connection.password= -topia.connection.driver_class=org.h2.Driver -# tchemit 2010-11-28 : comment this line, each test must define his own db path -#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data \ No newline at end of file Deleted: trunk/topia-persistence-tck/src/main/resources/log4j.properties =================================================================== --- trunk/topia-persistence-tck/src/main/resources/log4j.properties 2012-05-09 17:12:36 UTC (rev 2462) +++ trunk/topia-persistence-tck/src/main/resources/log4j.properties 2012-05-09 18:38:07 UTC (rev 2463) @@ -1,36 +0,0 @@ -### -# #%L -# ToPIA :: Persistence -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 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% -### -#\u00a0This log is used to display trace in generation - -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.nuiton.topia=INFO -#log4j.logger.org.nuiton.topiatest=DEBUG -log4j.logger.org.nuiton.topia.persistence.util=INFO