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

r2260 - trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 18:25:22 +0200 (Sat, 16 Apr 2011) New Revision: 2260 Url: http://nuiton.org/repositories/revision/topia/2260 Log: Improve test Modified: trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java Modified: trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java =================================================================== --- trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java 2011-04-16 16:11:31 UTC (rev 2259) +++ trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java 2011-04-16 16:25:22 UTC (rev 2260) @@ -19,36 +19,62 @@ */ public class MainTest { + protected TopiaContext rootContext; + protected TopiaContext transaction; @Before public void setUp() throws Exception { + + // Retrieve config and initialize TopiaContext root with Properties LibraryConfig config = new LibraryConfig(); - TopiaContext rootContext = - TopiaContextFactory.getContext(config.getProperties()); + rootContext = TopiaContextFactory.getContext(config.getProperties()); + + // Start the transaction transaction = rootContext.beginTransaction(); } @After public void tearDown() throws Exception { + + // Close the transaction transaction.closeContext(); + + // Drop the database (Work only with H2 database) + rootContext.clear(true); } @Test public void testCreateBook() throws Exception { - BookDAO dao = LibraryDAOHelper.getBookDAO(transaction); + // ---- PREPARE DATA ---- // Book book = new BookImpl(); book.setName("Topia for dummies"); book.setIsbn("T12"); + // ---- EXECUTE ---- // + + BookDAO dao = LibraryDAOHelper.getBookDAO(transaction); + dao.create(book); + // Commit current transaction to save the entity in the database transaction.commitTransaction(); + // ---- CHECK DATA ---- // + + // Close current transaction to ensure database result + transaction.closeContext(); + + // Reopen a new transaction to retrieve the previously saved book + transaction = rootContext.beginTransaction(); + dao = LibraryDAOHelper.getBookDAO(transaction); + + // Retrieve the book from its topiaId (primary key) Book bookLoaded = dao.findByTopiaId(book.getTopiaId()); + // It is the same value ! Assert.assertEquals(bookLoaded, book); }

1 0

r2259 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 18:11:31 +0200 (Sat, 16 Apr 2011) New Revision: 2259 Url: http://nuiton.org/repositories/revision/topia/2259 Log: Change log level + move constants from TopiaContextImpl to TopiaContextFactory Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-04-16 16:07:52 UTC (rev 2258) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-04-16 16:11:31 UTC (rev 2259) @@ -88,6 +88,15 @@ public final static String CONFIG_URL = Environment.URL; + public final static String CONFIG_PERSISTENCE_DIRECTORIES = + "topia.persistence.directories"; + + public final static String CONFIG_PERSISTENCE_CLASSES = + "topia.persistence.classes"; + + public final static String CONFIG_PERSISTENCE_PROPERTIES_FILE = + "topia.persistence.properties.file"; + /** * Permet de connaitre la liste des contexts encore en memoire, utile pour * du debuggage. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-16 16:07:52 UTC (rev 2258) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-16 16:11:31 UTC (rev 2259) @@ -116,20 +116,19 @@ String driverClass = props.getProperty(Environment.DRIVER); poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20 - if (log.isInfoEnabled()) { + if (log.isDebugEnabled()) { - log.info("Using Hibernate built-in connection pool (not for production use!)"); - log.info("Hibernate connection pool size: " + poolSize); + log.debug("Connection pool size: " + poolSize); } autocommit = PropertiesHelper.getBoolean(Environment.AUTOCOMMIT, props); - if (log.isInfoEnabled()) - log.info("autocommit mode: " + autocommit); + if (log.isDebugEnabled()) + log.debug("autocommit mode: " + autocommit); isolation = PropertiesHelper.getInteger(Environment.ISOLATION, props); if (isolation != null) { - if (log.isInfoEnabled()) { - log.info("JDBC isolation level: " + + if (log.isDebugEnabled()) { + log.debug("JDBC isolation level: " + Environment.isolationLevelToString(isolation)); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-04-16 16:07:52 UTC (rev 2258) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-04-16 16:11:31 UTC (rev 2259) @@ -131,14 +131,20 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaContextImpl.class); + /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_DIRECTORIES}*/ + @Deprecated public static final String TOPIA_PERSISTENCE_DIRECTORIES = - "topia.persistence.directories"; + TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES; + /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_CLASSES}*/ + @Deprecated public static final String TOPIA_PERSISTENCE_CLASSES = - "topia.persistence.classes"; + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES; + /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_PROPERTIES_FILE}*/ + @Deprecated public static final String TOPIA_PERSISTENCE_PROPERTIES_FILE = - "topia.persistence.properties.file"; + TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE; /** Le pere de ce context, les contexts initaux n'ont pas de context pere */ protected TopiaContextImplementor parentContext;

1 0

r2258 - in trunk/topia-tutorial: . src/main/java/org/nuiton/topia/tutorial/library src/main/resources src/test/java src/test/java/org src/test/java/org/nuiton src/test/java/org/nuiton/topia src/test/java/org/nuiton/topia/tutorial src/test/java/org/nuiton/topia/tutorial/library
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 18:07:52 +0200 (Sat, 16 Apr 2011) New Revision: 2258 Url: http://nuiton.org/repositories/revision/topia/2258 Log: Add createBook test Added: trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/LibraryConfig.java trunk/topia-tutorial/src/main/resources/log4j.properties trunk/topia-tutorial/src/test/java/org/ trunk/topia-tutorial/src/test/java/org/nuiton/ trunk/topia-tutorial/src/test/java/org/nuiton/topia/ trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/ trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/ trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java Modified: trunk/topia-tutorial/pom.xml trunk/topia-tutorial/src/main/resources/library-config.properties Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2011-04-16 14:29:27 UTC (rev 2257) +++ trunk/topia-tutorial/pom.xml 2011-04-16 16:07:52 UTC (rev 2258) @@ -9,19 +9,50 @@ <properties> - <topiaVersion>2.5.3</topiaVersion> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + + <topiaVersion>2.5.4-SNAPSHOT</topiaVersion> <eugeneVersion>2.3.3</eugeneVersion> + <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> </properties> <dependencies> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.128</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> + </dependencies>  Added: trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/LibraryConfig.java =================================================================== --- trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/LibraryConfig.java (rev 0) +++ trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/LibraryConfig.java 2011-04-16 16:07:52 UTC (rev 2258) @@ -0,0 +1,45 @@ +package org.nuiton.topia.tutorial.library; + +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.tutorial.library.model.LibraryDAOHelper; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; + +import java.util.Properties; + +/** + * Created: 16/04/11 + * + * @author fdesbois <desbois(a)codelutin.com> + * $Id$ + */ +public class LibraryConfig { + + protected static final String CONFIG_FILENAME = "library-config.properties"; + + protected ApplicationConfig config; + + public LibraryConfig() throws ArgumentsParserException { + + // New ApplicationConfig + config = new ApplicationConfig(); + + // Parse options in config, this will retrieve all properties from + // library-config.properties file in src/main/resources + config.setConfigFileName(CONFIG_FILENAME); + config.parse(); + + // Add option to tell Topia to use which entity classes are managed + // It's a prerequisite otherwise entities will be unknown + config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + LibraryDAOHelper.getImplementationClassesAsString()); + } + + /** + * @return all application properties + */ + public Properties getProperties() { + return config.getFlatOptions(); + } + +} Modified: trunk/topia-tutorial/src/main/resources/library-config.properties =================================================================== --- trunk/topia-tutorial/src/main/resources/library-config.properties 2011-04-16 14:29:27 UTC (rev 2257) +++ trunk/topia-tutorial/src/main/resources/library-config.properties 2011-04-16 16:07:52 UTC (rev 2258) @@ -0,0 +1,13 @@ +# Default url to database, this path will delete the database on mvn clean +# You can override this configuration using an other properties file in user directory +# For linux system : ~/.local/library/library-config.properties +hibernate.connection.url=jdbc:h2:file:target/db/h2data + +# Other database configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver + +hibernate.hbm2ddl.auto=update +hibernate.show_sql=true \ No newline at end of file Added: trunk/topia-tutorial/src/main/resources/log4j.properties =================================================================== --- trunk/topia-tutorial/src/main/resources/log4j.properties (rev 0) +++ trunk/topia-tutorial/src/main/resources/log4j.properties 2011-04-16 16:07:52 UTC (rev 2258) @@ -0,0 +1,34 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id: log4j.properties 2245 2011-04-14 12:47:09Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-persistence/src/test/resources/… $ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +#\u00a0This log is used to display trace in generation + +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.nuiton.topia=INFO Added: trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java =================================================================== --- trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java (rev 0) +++ trunk/topia-tutorial/src/test/java/org/nuiton/topia/tutorial/library/MainTest.java 2011-04-16 16:07:52 UTC (rev 2258) @@ -0,0 +1,55 @@ +package org.nuiton.topia.tutorial.library; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.tutorial.library.model.Book; +import org.nuiton.topia.tutorial.library.model.BookDAO; +import org.nuiton.topia.tutorial.library.model.BookImpl; +import org.nuiton.topia.tutorial.library.model.LibraryDAOHelper; + +/** + * Created: 16/04/11 + * + * @author fdesbois <desbois(a)codelutin.com> + * $Id$ + */ +public class MainTest { + + protected TopiaContext transaction; + + @Before + public void setUp() throws Exception { + LibraryConfig config = new LibraryConfig(); + TopiaContext rootContext = + TopiaContextFactory.getContext(config.getProperties()); + transaction = rootContext.beginTransaction(); + } + + @After + public void tearDown() throws Exception { + transaction.closeContext(); + } + + @Test + public void testCreateBook() throws Exception { + + BookDAO dao = LibraryDAOHelper.getBookDAO(transaction); + + Book book = new BookImpl(); + book.setName("Topia for dummies"); + book.setIsbn("T12"); + + dao.create(book); + + transaction.commitTransaction(); + + Book bookLoaded = dao.findByTopiaId(book.getTopiaId()); + + Assert.assertEquals(bookLoaded, book); + } + +}

1 0

r2257 - in trunk: topia-persistence/src/site/resources topia-tutorial topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model topia-tutorial/src/main/xmi
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 16:29:27 +0200 (Sat, 16 Apr 2011) New Revision: 2257 Url: http://nuiton.org/repositories/revision/topia/2257 Log: - move LibraryDAOHelper to model package - add method getFullName to Author entity Added: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthorWithOperation.png trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model/ trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model/AuthorImpl.java Modified: trunk/topia-tutorial/pom.xml trunk/topia-tutorial/src/main/xmi/library.zargo Added: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthorWithOperation.png =================================================================== (Binary files differ) Property changes on: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthorWithOperation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2011-04-16 13:34:48 UTC (rev 2256) +++ trunk/topia-tutorial/pom.xml 2011-04-16 14:29:27 UTC (rev 2257) @@ -86,7 +86,7 @@  <fullPackagePath>org.nuiton.topia.tutorial.library</fullPackagePath>  - <defaultPackage>org.nuiton.topia.tutorial.library</defaultPackage> + <defaultPackage>org.nuiton.topia.tutorial.library.model</defaultPackage> <templates> org.nuiton.topia.generator.TopiaMetaTransformer </templates> Added: trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model/AuthorImpl.java =================================================================== --- trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model/AuthorImpl.java (rev 0) +++ trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/model/AuthorImpl.java 2011-04-16 14:29:27 UTC (rev 2257) @@ -0,0 +1,16 @@ +package org.nuiton.topia.tutorial.library.model; + +/** + * Created: 16-04-2011 + * + * @author fdesbois <desbois(a)codelutin.com> + * $Id$ + */ +public class AuthorImpl extends AuthorAbstract { + + @Override + public String getFullName() { + return getFirstName() + " " + getLastName(); + } + +} Modified: trunk/topia-tutorial/src/main/xmi/library.zargo =================================================================== (Binary files differ)

1 0

r2256 - trunk/topia-persistence/src/site/resources
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 15:34:48 +0200 (Sat, 16 Apr 2011) New Revision: 2256 Url: http://nuiton.org/repositories/revision/topia/2256 Log: Add diagram for documentation Added: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthor.png Added: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthor.png =================================================================== (Binary files differ) Property changes on: trunk/topia-persistence/src/site/resources/ClassDiagram_BookAuthor.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2255 - trunk/topia-tutorial
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 15:34:31 +0200 (Sat, 16 Apr 2011) New Revision: 2255 Url: http://nuiton.org/repositories/revision/topia/2255 Log: Dependency over topia is useless in eugene plugin Modified: trunk/topia-tutorial/pom.xml Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2011-04-16 13:34:08 UTC (rev 2254) +++ trunk/topia-tutorial/pom.xml 2011-04-16 13:34:31 UTC (rev 2255) @@ -96,13 +96,6 @@ </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> </plugin> </plugins>

1 0

r2254 - trunk/topia-tutorial/src/main/xmi
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 15:34:08 +0200 (Sat, 16 Apr 2011) New Revision: 2254 Url: http://nuiton.org/repositories/revision/topia/2254 Log: Use model package to generate all entities and daos Modified: trunk/topia-tutorial/src/main/xmi/library.zargo Modified: trunk/topia-tutorial/src/main/xmi/library.zargo =================================================================== (Binary files differ)

1 0

r2253 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 15:33:29 +0200 (Sat, 16 Apr 2011) New Revision: 2253 Url: http://nuiton.org/repositories/revision/topia/2253 Log: Improve warning for constant prefix Modified: trunk/topia-persistence/ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Property changes on: trunk/topia-persistence ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project *.iml *.ipr *.iws nbproject + *.ipr *.iws .classpath .project target nbproject .settings Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-04-16 13:11:51 UTC (rev 2252) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-04-16 13:33:29 UTC (rev 2253) @@ -203,15 +203,6 @@ addInterface(result, TopiaDAO.class.getName() + "<E>"); String prefix = getConstantPrefix(clazz, ""); - - if (StringUtils.isEmpty(prefix)) { - - // no specific prefix, so no prefix - if (log.isWarnEnabled()) { - log.warn("[" + clazz.getName() + "] Will generate constants with NO prefix, not a good idea..."); - } - } - setConstantPrefix(prefix); // imports 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-04-16 13:11:51 UTC (rev 2252) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-04-16 13:33:29 UTC (rev 2253) @@ -24,18 +24,11 @@ */ package org.nuiton.topia.generator; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; - -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; - import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; @@ -55,8 +48,16 @@ import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; + + /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -120,7 +121,10 @@ // no specific prefix, so no prefix if (log.isWarnEnabled()) { - log.warn("[" + input.getName() + "] Will generate constants with NO prefix, not a good idea..."); + log.warn("[" + input.getName() + "] Will generate constants with NO prefix, not a good idea... \n" + + "Use '" + EugeneTagValues.TAG_CONSTANT_PREFIX + + "' tagvalue in your xmi properties. For example " + + "for all the model : model.tagvalue." + EugeneTagValues.TAG_CONSTANT_PREFIX + "=PROPERTY_"); } } setConstantPrefix(prefix);

1 0

r2252 - in trunk: . topia-tutorial topia-tutorial/src topia-tutorial/src/main topia-tutorial/src/main/java topia-tutorial/src/main/java/org topia-tutorial/src/main/java/org/nuiton topia-tutorial/src/main/java/org/nuiton/topia topia-tutorial/src/main/java/org/nuiton/topia/tutorial topia-tutorial/src/main/resources topia-tutorial/src/main/xmi topia-tutorial/src/test
by fdesbois＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: fdesbois Date: 2011-04-16 15:11:51 +0200 (Sat, 16 Apr 2011) New Revision: 2252 Url: http://nuiton.org/repositories/revision/topia/2252 Log: Introduce topia-tutorial (independent from topia build and hierarchy) Added: trunk/topia-tutorial/ trunk/topia-tutorial/pom.xml trunk/topia-tutorial/src/ trunk/topia-tutorial/src/main/ trunk/topia-tutorial/src/main/java/ trunk/topia-tutorial/src/main/java/org/ trunk/topia-tutorial/src/main/java/org/nuiton/ trunk/topia-tutorial/src/main/java/org/nuiton/topia/ trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/ trunk/topia-tutorial/src/main/java/org/nuiton/topia/tutorial/library/ trunk/topia-tutorial/src/main/resources/ trunk/topia-tutorial/src/main/resources/library-config.properties trunk/topia-tutorial/src/main/xmi/ trunk/topia-tutorial/src/main/xmi/library.properties trunk/topia-tutorial/src/main/xmi/library.zargo trunk/topia-tutorial/src/test/ trunk/topia-tutorial/src/test/java/ trunk/topia-tutorial/src/test/resources/ Property changes on: trunk/topia-tutorial ___________________________________________________________________ Added: svn:ignore + target Added: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml (rev 0) +++ trunk/topia-tutorial/pom.xml 2011-04-16 13:11:51 UTC (rev 2252) @@ -0,0 +1,112 @@ +<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> + + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-tutorial</artifactId> + <version>1.0</version> + <packaging>jar</packaging> + + <properties> + + <topiaVersion>2.5.3</topiaVersion> + <eugeneVersion>2.3.3</eugeneVersion> + + </properties> + + <dependencies> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA :: Tutorial Library</name> + <description> + Tutorial based on ToPIA framework + </description> + <inceptionYear>2011</inceptionYear> + <url>http://maven-site.nuiton.org/topia</url> + +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>bleny</id> + <name>Brendan Le Ny</name> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + +  +  +  + + <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.tutorial.library</fullPackagePath> +  + <defaultPackage>org.nuiton.topia.tutorial.library</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + + </build> + +</project> Added: trunk/topia-tutorial/src/main/xmi/library.properties =================================================================== --- trunk/topia-tutorial/src/main/xmi/library.properties (rev 0) +++ trunk/topia-tutorial/src/main/xmi/library.properties 2011-04-16 13:11:51 UTC (rev 2252) @@ -0,0 +1,15 @@ +# Properties file used by EUGene generator. +# +# It will contains tagvalue and stereotype definitions. +# For all model use : model.tagvalue or model.stereotype +# For a specific entity use its full qualified name (ex: org.nuiton.topia.tutorial.library.Book) +# It's also possible to define tagvalues or stereotypes on attributes. For operations it must be +# declared in the xmi or zargo file or make sure that the operation name is unique in the class. +# +# A best practice is to declare all tagvalues in this file and all stereotypes in the xmi/zargo file + +# It's advised to not generate toString in entities to avoid some Lazy problems when debugging +model.tagvalue.notGenerateToString=true + +# Prefix for all generated constants (used for property names in entities) +model.tagvalue.constantPrefix=PROPERTY_ \ No newline at end of file Added: trunk/topia-tutorial/src/main/xmi/library.zargo =================================================================== (Binary files differ) Property changes on: trunk/topia-tutorial/src/main/xmi/library.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2251 - in trunk/topia-persistence/src/site: . rst
by bleny＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: bleny Date: 2011-04-16 12:09:55 +0200 (Sat, 16 Apr 2011) New Revision: 2251 Url: http://nuiton.org/repositories/revision/topia/2251 Log: minor fixes in documentation Modified: trunk/topia-persistence/src/site/rst/howto.rst trunk/topia-persistence/src/site/rst/index.rst trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/rst/howto.rst =================================================================== --- trunk/topia-persistence/src/site/rst/howto.rst 2011-04-15 13:00:08 UTC (rev 2250) +++ trunk/topia-persistence/src/site/rst/howto.rst 2011-04-16 10:09:55 UTC (rev 2251) @@ -223,7 +223,7 @@ Manipulation des entités ~~~~~~~~~~~~~~~~~~~~~~~~ ->>> PersonDAO personDAO = <nom modele>Helper.getPersonDAO(transaction); +>>> PersonDAO personDAO = <nom modele>DAOHelper.getPersonDAO(transaction); Récupération d'un DAO pour accéder à une entité. Modified: trunk/topia-persistence/src/site/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-04-15 13:00:08 UTC (rev 2250) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-04-16 10:09:55 UTC (rev 2251) @@ -42,22 +42,21 @@ <menu name="Utilisateur" inherit="top"> <item name="Presentation" href="index.html" /> <item name="Utilisation" href="howto.html" /> + <item name="Génération des modèles" href="ModelGeneration.html"/> <item name="Tag values" href="tagvalues.html" /> + <item name="TopiaQuery" href="TopiaQuery.html"/> + <item name="Gestion des evenements" href="event.html"/> + <item name="FAQ" href="FAQ.html"/> </menu> <menu name="Developpeur"> <item name="Todo" href="Todo.html"/> <item name="Mapping hibernate" href="HibernateMapping.html"/> - <item name="Gestion des evenements" href="event.html"/> <item name="Isolation" href="Isolation.html"/> <item name="Schema migration" href="SchemaMigration.html"/> <item name="Securité" href="security.html"/> - <item name="Génération des modèles" href="ModelGeneration.html"/> <item name="TopiaContextFactory" href="Devel.html"/> - <item name="TopiaQuery" href="TopiaQuery.html"/> - <item name="FAQ" href="FAQ.html"/> <item name="Projets similaires" href="project.html"/> - <item name="Tag values" href="tagvalues.html"/> </menu> <menu name="Téléchargement">

1 0