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

r2912 - in trunk: topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract topia-it/src/license topia-junit/src/license topia-templates/src/license
by tchemit＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: tchemit Date: 2013-12-03 19:25:53 +0100 (Tue, 03 Dec 2013) New Revision: 2912 Url: http://nuiton.org/projects/topia/repository/revisions/2912 Log: add missing svn properties + headers Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java trunk/topia-it/src/license/THIRD-PARTY.properties trunk/topia-junit/src/license/THIRD-PARTY.properties trunk/topia-templates/src/license/THIRD-PARTY.properties Modified: 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 2013-12-03 18:25:15 UTC (rev 2911) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java 2013-12-03 18:25:53 UTC (rev 2912) @@ -3,7 +3,7 @@ * ToPIA :: Persistence * * $Id$ - * $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-it/src/test/java/org/nuiton/top… $ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/topia-it/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/topia-junit/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/topia-templates/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r2911 - in trunk: topia-it topia-it/src topia-it/src/it/ANOMALIE-1640 topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract topia-it/src/license topia-junit/src topia-junit/src/license topia-persistence topia-persistence/src topia-templates/src topia-templates/src/license
by tchemit＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

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> +  +  + </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> + +  + <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> -  -  -  - - <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> + <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>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/top… $ + * %% + * 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> -  -  - </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> - -  - <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

1 0

r2910 - trunk/topia-persistence/src/it/ANOMALIE-1640
by sbavencoff＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: sbavencoff Date: 2013-12-03 18:32:11 +0100 (Tue, 03 Dec 2013) New Revision: 2910 Url: http://nuiton.org/projects/topia/repository/revisions/2910 Log: fix : change goal on eugene maven plugin Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2013-12-03 17:04:33 UTC (rev 2909) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2013-12-03 17:32:11 UTC (rev 2910) @@ -129,7 +129,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions>

1 0

r2909 - in trunk: topia-it topia-junit topia-templates
by sbavencoff＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: sbavencoff Date: 2013-12-03 18:04:33 +0100 (Tue, 03 Dec 2013) New Revision: 2909 Url: http://nuiton.org/projects/topia/repository/revisions/2909 Log: fix : add LICENSE.txt Modified: trunk/topia-it/LICENSE.txt trunk/topia-junit/LICENSE.txt trunk/topia-templates/LICENSE.txt Modified: trunk/topia-it/LICENSE.txt =================================================================== --- trunk/topia-it/LICENSE.txt 2013-12-03 16:47:40 UTC (rev 2908) +++ trunk/topia-it/LICENSE.txt 2013-12-03 17:04:33 UTC (rev 2909) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Modified: trunk/topia-junit/LICENSE.txt =================================================================== --- trunk/topia-junit/LICENSE.txt 2013-12-03 16:47:40 UTC (rev 2908) +++ trunk/topia-junit/LICENSE.txt 2013-12-03 17:04:33 UTC (rev 2909) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Modified: trunk/topia-templates/LICENSE.txt =================================================================== --- trunk/topia-templates/LICENSE.txt 2013-12-03 16:47:40 UTC (rev 2908) +++ trunk/topia-templates/LICENSE.txt 2013-12-03 17:04:33 UTC (rev 2909) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. +

1 0

r2908 - in trunk: topia-it topia-junit topia-service-replication topia-templates
by sbavencoff＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: sbavencoff Date: 2013-12-03 17:47:40 +0100 (Tue, 03 Dec 2013) New Revision: 2908 Url: http://nuiton.org/projects/topia/repository/revisions/2908 Log: fix : Update dependencies Modified: trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-03 09:46:26 UTC (rev 2907) +++ trunk/topia-it/pom.xml 2013-12-03 16:47:40 UTC (rev 2908) @@ -59,6 +59,41 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> +  <dependency> <groupId>com.h2database</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2013-12-03 09:46:26 UTC (rev 2907) +++ trunk/topia-junit/pom.xml 2013-12-03 16:47:40 UTC (rev 2908) @@ -54,11 +54,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-12-03 09:46:26 UTC (rev 2907) +++ trunk/topia-service-replication/pom.xml 2013-12-03 16:47:40 UTC (rev 2908) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-03 09:46:26 UTC (rev 2907) +++ trunk/topia-templates/pom.xml 2013-12-03 16:47:40 UTC (rev 2908) @@ -59,6 +59,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -69,21 +74,11 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency>

1 0

r2907 - in trunk: topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: bleny Date: 2013-12-03 10:46:26 +0100 (Tue, 03 Dec 2013) New Revision: 2907 Url: http://nuiton.org/projects/topia/repository/revisions/2907 Log: fixes #2853 add a special case for addIn(empty collection) Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-03 09:19:37 UTC (rev 2906) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-03 09:46:26 UTC (rev 2907) @@ -31,6 +31,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; +import java.util.Collections; public class HqlAndParametersBuilderTest { @@ -126,4 +127,16 @@ } + @Test + public void testAddInWithEmptyValues() { + + hqlAndParametersBuilder.addIn("myProp", Collections.emptyList()); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("myProp in (:)")); + Assert.assertTrue(actualHql.contains("myProp in ()")); + + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-03 09:19:37 UTC (rev 2906) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-03 09:46:26 UTC (rev 2907) @@ -157,15 +157,21 @@ } } String whereClause; + String inClauseValues; + if (hqlParameterNames.isEmpty()) { + inClauseValues = ""; + } else { + inClauseValues = ":" + StringUtils.join(hqlParameterNames, ", :"); + } if (in) { - String inClause = aliasedProperty + " in (:" + StringUtils.join(hqlParameterNames, ", :")+ ")"; + String inClause = aliasedProperty + " in (" + inClauseValues + ")"; if (propertyMayBeNull) { whereClause = aliasedProperty + " is null or " + inClause; } else { whereClause = inClause; } } else { - String inClause = aliasedProperty + " not in (:" + StringUtils.join(hqlParameterNames, ", :") + ")"; + String inClause = aliasedProperty + " not in (" + inClauseValues + ")"; if (propertyMayBeNull) { whereClause = aliasedProperty + " is not null and " + inClause; } else {

1 0

r2906 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Dec. 3, 2013

Dec. 3, 2013

Author: bleny Date: 2013-12-03 10:19:37 +0100 (Tue, 03 Dec 2013) New Revision: 2906 Url: http://nuiton.org/projects/topia/repository/revisions/2906 Log: check that given topia Id is not blank in dao Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-12-02 10:07:49 UTC (rev 2905) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-12-03 09:19:37 UTC (rev 2906) @@ -594,7 +594,7 @@ @Override public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forTopiaIdEquals(String topiaId) { - Preconditions.checkNotNull(topiaId, "given topiaId is null"); + Preconditions.checkArgument(StringUtils.isNotBlank(topiaId), "given topiaId is blank"); TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); return result; }

1 0

r2905 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org Dec. 2, 2013

Dec. 2, 2013

Author: bleny Date: 2013-12-02 11:07:49 +0100 (Mon, 02 Dec 2013) New Revision: 2905 Url: http://nuiton.org/projects/topia/repository/revisions/2905 Log: check given entity in generated dao#delete(entity) is persisted Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2013-11-28 09:41:24 UTC (rev 2904) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2013-12-02 10:07:49 UTC (rev 2905) @@ -496,6 +496,14 @@ PROP_DEFAULT_PACKAGE) + '.' + modelName + "DAOHelper.getImplementationClass"; + body.append("" +/*{ + if ( ! entity.isPersisted()) { + throw new IllegalArgumentException("entity " + entity + " is not persisted, you can't delete it"); + } +}*/ + ); + boolean hibernateSupportGenerated = false; for (ObjectModelAttribute attr : clazz.getAttributes()) {

1 0