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

r2331 - trunk/topia-persistence
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 16:43:31 +0200 (Mon, 12 Sep 2011) New Revision: 2331 Url: http://nuiton.org/repositories/revision/topia/2331 Log: convention over configuration Modified: trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-12 13:33:21 UTC (rev 2330) +++ trunk/topia-persistence/pom.xml 2011-09-12 14:43:31 UTC (rev 2331) @@ -315,7 +315,6 @@ <plugin> <artifactId>maven-invoker-plugin</artifactId> <configuration> - <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>

1 0

r2330 - trunk/topia-persistence/src/it
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 15:33:21 +0200 (Mon, 12 Sep 2011) New Revision: 2330 Url: http://nuiton.org/repositories/revision/topia/2330 Log: fix IT repositories setting Modified: trunk/topia-persistence/src/it/settings.xml Modified: trunk/topia-persistence/src/it/settings.xml =================================================================== --- trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:27:22 UTC (rev 2329) +++ trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:33:21 UTC (rev 2330) @@ -48,9 +48,9 @@ <repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> @@ -58,19 +58,6 @@ </releases> </repository> -  - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> </repositories> <pluginRepositories> @@ -88,7 +75,7 @@ <pluginRepository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -96,20 +83,6 @@ <enabled>true</enabled> </releases> </pluginRepository> - -  - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> </pluginRepositories> </profile> </profiles>

1 0

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 15:27:22 +0200 (Mon, 12 Sep 2011) New Revision: 2329 Url: http://nuiton.org/repositories/revision/topia/2329 Log: add it for Anomalie #1640: Cannot create TopiaContext when using an abstract class Added: trunk/topia-persistence/src/it/ trunk/topia-persistence/src/it/ANOMALIE-1640/ trunk/topia-persistence/src/it/ANOMALIE-1640/LICENSE.txt trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt trunk/topia-persistence/src/it/ANOMALIE-1640/changelog.txt trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy trunk/topia-persistence/src/it/ANOMALIE-1640/src/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties trunk/topia-persistence/src/it/settings.xml Modified: trunk/pom.xml trunk/topia-persistence/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-12 12:09:52 UTC (rev 2328) +++ trunk/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -75,6 +75,7 @@ <hibernateVersion>3.6.7.Final</hibernateVersion>  <sl4jVersion>1.6.1</sl4jVersion> + <h2Version>1.3.160</h2Version>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -164,7 +165,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.157</version> + <version>${h2Version}</version> <scope>test</scope> </dependency> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-12 12:09:52 UTC (rev 2328) +++ trunk/topia-persistence/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -301,6 +301,41 @@ </build> </profile> + <profile> + <id>run-its</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>!false</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <postBuildHookScript>verify</postBuildHookScript> + <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> +  <profile> <id>reporting</id> Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1 @@ +To test the http://nuiton.org/issues/1640 bug. \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,46 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### + +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean test + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,140 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <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> + +  +  +  + + <name>Topia :: ANOMALIE-1640</name> + <description>Module de test pour Topia avec entités abstraites</description> + <url>http://nuiton.org/issues/1640</url> + +  +  +  + <properties> + <eugeneVersion>@eugeneVersion@</eugeneVersion> + <hibernateVersion>@hibernateVersion@</hibernateVersion> + <slf4jVersion>@sl4jVersion@</slf4jVersion> + <h2Version>@h2Version@</h2Version> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>test</scope> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> + <configuration> +  + <fullPackagePath>org.nuiton.topia.testabstract</fullPackagePath> +  + <defaultPackage>org.nuiton.topia.testabstract</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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% + */ +// Tests are made in the test phase +return true; \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,27 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### +model.tagvalue.copyright=/* *##%\n Copyright (C) 2011 Code Lutin\n *##%*/ +model.tagvalue.notGenerateToString=true +model.tagvalue.constantPrefix=PROPERTY_ Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo =================================================================== (Binary files differ) Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/topia-persistence/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 (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,49 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; + +public class TopiaAbstractTest { + + @Test + public void testCreateCar() throws TopiaException { + + TopiaContext context = TopiaContextFactory.getContext(); + try { + TopiaContext transaction = context.beginTransaction(); + + CarDAO carDAO = TopiaTestAbstractDAOHelper.getCarDAO(transaction); + carDAO.create(); + transaction.commitTransaction(); + } finally { + context.closeContext(); + } + } + +} Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,36 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### +topia.persistence.classes=org.nuiton.topia.testabstract.CarImpl,org.nuiton.topia.testabstract.VehicleImpl + +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false +hibernate.format_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/db/mydb + Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,30 @@ +### +# #%L +# T3 :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 IRD, Codelutin, Tony Chemit +# %% +# 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% +### +# Global logging configuration +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%F:%L) %M - %m%n Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/settings.xml =================================================================== --- trunk/topia-persistence/src/it/settings.xml (rev 0) +++ trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + +  + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + +  + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> Property changes on: trunk/topia-persistence/src/it/settings.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2328 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 14:09:52 +0200 (Mon, 12 Sep 2011) New Revision: 2328 Url: http://nuiton.org/repositories/revision/topia/2328 Log: Anomalie #1640: Cannot create TopiaContext when using an abstract class Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -88,6 +88,8 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); + public static final String SERIAL_VERSION_UID = "serialVersionUID"; + protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; @@ -255,17 +257,19 @@ // Extends for (ObjectModelClass parent : input.getSuperclasses()) { - String extendClass = parent.getQualifiedName(); - //Si une des classes parentes définies des méthodes abstraites, son - // impl ne sera pas créé - boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); - if (TopiaGeneratorUtil.isEntity(parent)) { - if (abstractParent) { - extendClass += "Abstract"; - } else { - extendClass += "Impl"; - } - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl, moreover use the util method instead + String extendClass = TopiaGeneratorUtil.getDOType(parent, model); +// String extendClass = parent.getQualifiedName(); +// //Si une des classes parentes définies des méthodes abstraites, son +// // impl ne sera pas créé +// boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); +// if (TopiaGeneratorUtil.isEntity(parent)) { +// if (abstractParent) { +// extendClass += "Abstract"; +// } else { +// extendClass += "Impl"; +// } +// } setSuperClass(outputAbstract, extendClass); } @@ -275,7 +279,7 @@ } // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue("serialVersionUID", + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model ); @@ -284,7 +288,7 @@ // use a default one svUID = "1L"; } - addConstant(outputAbstract, "serialVersionUID", long.class, svUID, + addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); addContextableMethods(input, outputAbstract); @@ -384,13 +388,13 @@ setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); String svUID = - TopiaGeneratorUtil.findTagValue("serialVersionUID", input, model); + TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); if (svUID == null) { // use a default one svUID = "1L"; } - addConstant(outputImpl, "serialVersionUID", long.class, svUID, + addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -43,7 +43,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -523,11 +522,13 @@ } ObjectModelClass clazz = model.getClass(type); if (isEntity(clazz)) { - if (shouldBeAbstract(clazz)) { - type += "Abstract"; - } else { - type += "Impl"; - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl + type += "Impl"; +// if (shouldBeAbstract(clazz)) { +// type += "Abstract"; +// } else { +// type += "Impl"; +// } } return type; }

1 0

r2327 - trunk
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 13:10:40 +0200 (Mon, 12 Sep 2011) New Revision: 2327 Url: http://nuiton.org/repositories/revision/topia/2327 Log: T?\195?\162che #1739: Updates to eugene 2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-12 10:46:03 UTC (rev 2326) +++ trunk/pom.xml 2011-09-12 11:10:40 UTC (rev 2327) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.3.5</eugeneVersion> + <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0

r2326 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org Sept. 12, 2011

Sept. 12, 2011

Author: tchemit Date: 2011-09-12 12:46:03 +0200 (Mon, 12 Sep 2011) New Revision: 2326 Url: http://nuiton.org/repositories/revision/topia/2326 Log: T?\195?\162che #1736: Updates to nuiton-utils 2.3 Evolution #1679: add missing constants for field on TopiaEntity Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:05:26 UTC (rev 2325) +++ trunk/pom.xml 2011-09-12 10:46:03 UTC (rev 2326) @@ -68,7 +68,7 @@  <eugeneVersion>2.3.5</eugeneVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2011-09-09 16:05:26 UTC (rev 2325) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2011-09-12 10:46:03 UTC (rev 2326) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2010 CodeLutin, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -73,6 +73,10 @@ String TOPIA_VERSION = "topiaVersion"; + String COMPOSITE = "composite"; + + String AGGREGATE = "aggregate"; + /** * Unique technical Id of the entity. This id contains the full qualified * name of the entity interface. This id has also an index and his used to Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-09-09 16:05:26 UTC (rev 2325) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-09-12 10:46:03 UTC (rev 2326) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 Codelutin, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -39,6 +39,8 @@ * By : $Author$ */ public interface TopiaEntityContextable extends TopiaEntity { + + String TOPIA_CONTEXT = "topiaContext"; /** * Set topia context.

1 0

r2325 - trunk
by tchemit＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 18:05:26 +0200 (Fri, 09 Sep 2011) New Revision: 2325 Url: http://nuiton.org/repositories/revision/topia/2325 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:51:03 UTC (rev 2324) +++ trunk/pom.xml 2011-09-09 16:05:26 UTC (rev 2325) @@ -290,7 +290,6 @@ <packaging>pom</packaging> - <build> <pluginManagement> @@ -414,4 +413,11 @@ <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + </project>

1 0

r2324 - trunk
by maven-release＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: maven-release Date: 2011-09-09 17:51:03 +0200 (Fri, 09 Sep 2011) New Revision: 2324 Url: http://nuiton.org/repositories/revision/topia/2324 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-01 15:18:20 UTC (rev 2323) +++ trunk/pom.xml 2011-09-09 15:51:03 UTC (rev 2324) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <artifactId>topia</artifactId>

1 0

r2323 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by sletellier＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: sletellier Date: 2011-09-01 17:18:20 +0200 (Thu, 01 Sep 2011) New Revision: 2323 Url: http://nuiton.org/repositories/revision/topia/2323 Log: #1730 : DAO set null taget entity when delete association Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-08-29 16:38:35 UTC (rev 2322) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-09-01 15:18:20 UTC (rev 2323) @@ -562,7 +562,11 @@ .getDAO(<%=attrSimpleType%>.class) .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); for (<%=attrSimpleType%> item : list) { - item.set<%=StringUtils.capitalize(reverseAttrName)%>(null); + + // sletellier : Set null only if target is concerned by deletion + if (entity.equals(item.get<%=StringUtils.capitalize(reverseAttrName)%>())) { + item.set<%=StringUtils.capitalize(reverseAttrName)%>(null); + } }*/ ); if (attr.isAggregate()) {

1 0

r2322 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Aug. 29, 2011

Aug. 29, 2011

Author: tchemit Date: 2011-08-29 18:38:35 +0200 (Mon, 29 Aug 2011) New Revision: 2322 Url: http://nuiton.org/repositories/revision/topia/2322 Log: Evolution #1716: Improve generators Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-08-19 16:29:32 UTC (rev 2321) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-08-29 16:38:35 UTC (rev 2322) @@ -51,6 +51,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -112,9 +113,9 @@ if (log.isDebugEnabled()) { log.debug("for entity : " + input.getQualifiedName()); - log.info("Will use classLoader " + getClassLoader()); + log.debug("Will use classLoader " + getClassLoader()); } - + // fix once for all the constant prefix to use String prefix = getConstantPrefix(input, ""); if (StringUtils.isEmpty(prefix)) { @@ -185,23 +186,30 @@ protected void createEntityInterface(ObjectModelClass input) { - outputInterface = createInterface(input.getName(), input.getPackageName()); + outputInterface = createInterface(input.getName(), + input.getPackageName()); // Documentation if (TopiaGeneratorUtil.hasDocumentation(input)) { setDocumentation(outputInterface, input.getDocumentation()); } + if (log.isTraceEnabled()) { + log.trace("Will add interfaces on " + + outputInterface.getQualifiedName()); + } + + List<String> interfaceAlreadyDone = new LinkedList<String> (); // Extends for (ObjectModelClassifier parent : input.getInterfaces()) { - addInterface(outputInterface, parent.getQualifiedName()); + addInterface(interfaceAlreadyDone, outputInterface, parent); } // Extends from inheritance boolean needTopiaEntity = true; for (ObjectModelClassifier parent : input.getSuperclasses()) { if (TopiaGeneratorUtil.isEntity(parent)) { - addInterface(outputInterface, parent.getQualifiedName()); + addInterface(interfaceAlreadyDone, outputInterface, parent); needTopiaEntity = false; break; } @@ -209,12 +217,16 @@ // Extends TopiaEntity (only if hasn't parent entity) if (needTopiaEntity) { + + Class<?> interfaze = TopiaEntity.class; + if (TopiaGeneratorUtil.isContextable(input)) { - addInterface(outputInterface, TopiaEntityContextable.class); + interfaze = TopiaEntityContextable.class; } - else { - addInterface(outputInterface, TopiaEntity.class); - } + + addInterface(interfaceAlreadyDone, + outputInterface, + interfaze); } } @@ -263,12 +275,17 @@ } // serialVersionUID - String svUID = - TopiaGeneratorUtil.findTagValue("serialVersionUID", input, model); - if (svUID != null) { - addConstant(outputInterface, "serialVersionUID", long.class, svUID, + String svUID = TopiaGeneratorUtil.findTagValue("serialVersionUID", + input, + model + ); + if (svUID == null) { + + // use a default one + svUID = "1L"; + } + addConstant(outputAbstract, "serialVersionUID", long.class, svUID, ObjectModelModifier.PRIVATE); - } addContextableMethods(input, outputAbstract); } @@ -276,8 +293,11 @@ /** * Ajout les methodes necessaire à l'interface {@link TopiaEntityContextable} * si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} est renseigné. + * @param input + * @param outputAbstract */ - protected void addContextableMethods(ObjectModelClass input, ObjectModelClass outputAbstract) { + protected void addContextableMethods(ObjectModelClass input, + ObjectModelClass outputAbstract) { if (TopiaGeneratorUtil.isContextable(input)) { @@ -304,7 +324,6 @@ }*/ ); } - } protected boolean isGenerateImpl(ObjectModelClass input, @@ -363,6 +382,16 @@ setDocumentation(outputImpl, "Implantation des operations pour l'entité " + input.getName() + "."); setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); + + String svUID = + TopiaGeneratorUtil.findTagValue("serialVersionUID", input, model); + if (svUID == null) { + + // use a default one + svUID = "1L"; + } + addConstant(outputImpl, "serialVersionUID", long.class, svUID, + ObjectModelModifier.PRIVATE); } /** @@ -1552,4 +1581,46 @@ return operation; } + + protected void addInterface(List<String> interfaceAlreadyDone, + ObjectModelClassifier output, + ObjectModelClassifier interfaze) { + String qualifiedName = interfaze.getQualifiedName(); + if (!interfaceAlreadyDone.contains(qualifiedName)) { + + interfaceAlreadyDone.add(qualifiedName); + + if (output != null) { + + // add it to output + addInterface(output, qualifiedName); + + if (log.isTraceEnabled()) { + log.trace("Add interface " + qualifiedName + " on " + + output.getQualifiedName()); + } + } else { + if (log.isTraceEnabled()) { + log.trace("Skip included interface " + qualifiedName); + } + } + + // scan also all interfaces or super-classes of it + for (ObjectModelClassifier parent : interfaze.getInterfaces()) { + addInterface(interfaceAlreadyDone, null, parent); + } + } + } + + protected void addInterface(List<String> interfaceAlreadyDone, + ObjectModelClassifier output, + Class<?> clazz) { + String qualifiedName = clazz.getName(); + if (!interfaceAlreadyDone.contains(qualifiedName)) { + + // add it to output + addInterface(output, qualifiedName); + + } + } }

1 0