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

r2550 - trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework
by athimel＠users.nuiton.org May 29, 2012

May 29, 2012

Author: athimel Date: 2012-05-29 16:24:51 +0200 (Tue, 29 May 2012) New Revision: 2550 Url: http://nuiton.org/repositories/revision/topia/2550 Log: Remove dead code Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-29 14:14:36 UTC (rev 2549) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-29 14:24:51 UTC (rev 2550) @@ -191,12 +191,6 @@ TopiaEntity entity = castToTopiaEntityOrNull(event.getEntity()); TopiaContextImplementor entityContext = findContext(entity); - // TODO AThimel 22/05/2012 Is it really necessary ? It fails for me -// // Using JPA mapping, must generate id here -// Class<?> entityInterface = TopiaPersistenceUtil.getEntityContract(entity.getClass()); -// String topiaId = TopiaId.create(entityInterface); -// entity.setTopiaId(topiaId); - if (entityContext != null && entity != null) { Object[] entityState = event.getState(); entityContext.getFiresSupport().fireOnPreCreate(

1 0

r2549 - in trunk: topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings topia-service-migration/src/main/resources/i18n topia-service-security
by athimel＠users.nuiton.org May 29, 2012

May 29, 2012

Author: athimel Date: 2012-05-29 16:14:36 +0200 (Tue, 29 May 2012) New Revision: 2549 Url: http://nuiton.org/repositories/revision/topia/2549 Log: Create TopiaSQLWork in replacment of org.hibernate.jdbc.Work Fix topia-migration-service Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLWork.java Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties trunk/topia-service-security/pom.xml Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -34,6 +34,7 @@ import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaH2Util; import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntity; @@ -413,11 +414,28 @@ */ void executeSQL(String sqlScript) throws TopiaException; + /** + * Runs the given SQL work on the current context + * + * @param sqlWork the SQL work instance to execute + */ + void doSQLWork(TopiaSQLWork sqlWork); + /* -------------------- SCHEMA MANAGMENT -----------------------------*/ /** - * Detect if the table is created on storage for a given persistent class. + * Detects if the db associated to the current context contains at least one + * entity table. * + * @return {@code true} if there is no schema for any of the dealed entities, + * {@code false} otherwise. + * @since 3.0 + */ + boolean isSchemaEmpty(); + + /** + * Detects if the table is created on storage for a given persistent class. + * * @param clazz the researched class * @return true if the table exists on storage * @throws TopiaException if the context is not initialized @@ -425,6 +443,12 @@ boolean isSchemaExist(Class<?> clazz) throws TopiaException; /** + * @return the current schema name + * @since 3.0 + */ + String getSchemaName(); + + /** * Triggers database schema creation * * @throws TopiaException if any exception Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -60,7 +60,7 @@ new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.SOFT); -// public final static String CONFIG_DEFAULT_SCHEMA = Environment.DEFAULT_SCHEMA; + public final static String CONFIG_DEFAULT_SCHEMA = "topia.default_schema"; // public final static String CONFIG_DIALECT = Environment.DIALECT; // 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 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -64,6 +64,7 @@ import javax.persistence.PersistenceException; import javax.persistence.Query; import javax.persistence.metamodel.EntityType; +import javax.persistence.metamodel.Metamodel; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; @@ -945,39 +946,51 @@ } } - // TODO AThimel 23/05/2012 Work not supported anymore ? -// public static class SQLWork implements Work { -// private final String script; -// -// public SQLWork(String script) { -// this.script = script; -// } -// -// @Override -// public void execute(Connection connection) throws SQLException { -// PreparedStatement sta = connection.prepareStatement(script); -// try { -// sta.execute(); -// } finally { -// sta.close(); -// } -// } -// } + @Override + public void doSQLWork(TopiaSQLWork sqlWork) { + getSpecificUtil().doSQLWork(this, sqlWork); + } - /* -------------------- SCHEMA MANAGMENT -----------------------------*/ @Override + public boolean isSchemaEmpty() { + try { + Metamodel metamodel = getEntityManager().getMetamodel(); + Set<EntityType<?>> entities = metamodel.getEntities(); + for (EntityType<?> entity : entities) { + String entityName = entity.getName(); + Class entityClass = Class.forName(entityName); + if (isSchemaExist(entityClass)) { + return false; + } + } + return true; + } catch (TopiaException te) { + throw new TopiaRuntimeException( + "Unable to detect if schema is empty", te); + } catch (ClassNotFoundException cnfe) { + throw new TopiaRuntimeException( + "Unable to detect if schema is empty", cnfe); + } + } + + @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { checkClosed("isSchemaExist"); - boolean result = getSpecificUtil().isSchemaExist(clazz); + boolean result = getSpecificUtil().isTableExists(clazz); return result; } @Override + public String getSchemaName() { + return getConfig().getProperty(TopiaContextFactory.CONFIG_DEFAULT_SCHEMA); + } + + @Override public void createSchema() throws TopiaException { try { boolean showSchema = log.isDebugEnabled(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -24,6 +24,7 @@ */ package org.nuiton.topia.framework; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; @@ -39,8 +40,8 @@ /** * An executor of sql query which permits to obtain a single result via - * the method {@link #findSingleResult(TopiaContextImplementor)} - * or a multiple result with method {@link #findMultipleResult(TopiaContextImplementor)}. + * the method {@link #findSingleResult(TopiaContext)} + * or a multiple result with method {@link #findMultipleResult(TopiaContext)}. * * @param <O> the type of result data * @since 2.5 @@ -72,28 +73,27 @@ * @return the single result or {@code null} if none found. * @throws TopiaException for any pb */ - public O findSingleResult(TopiaContextImplementor tx) throws TopiaException { + public O findSingleResult(TopiaContext tx) throws TopiaException { final List<O> result = new ArrayList<O>(); -// tx.getEntityManager().doWork(new Work() { -// -// @Override -// public void execute(Connection connection) throws SQLException { -// -// PreparedStatement ps = prepareQuery(connection); -// -// try { -// ResultSet set = ps.executeQuery(); -// -// findSingleResult(result, set); -// -// } catch (Exception e) { -// throw new TopiaRuntimeException("Could not execute query", e); -// } finally { -// ps.close(); -// } -// } -// }); + tx.doSQLWork(new TopiaSQLWork() { + @Override + public void execute(Connection connection) throws SQLException { + + PreparedStatement ps = prepareQuery(connection); + + try { + ResultSet set = ps.executeQuery(); + + findSingleResult(result, set); + + } catch (Exception e) { + throw new TopiaRuntimeException("Could not execute query", e); + } finally { + ps.close(); + } + } + }); return result.isEmpty() ? null : result.get(0); } @@ -104,27 +104,27 @@ * @return the list of results (the list is empty if non result is found). * @throws TopiaException for any pb */ - public List<O> findMultipleResult(TopiaContextImplementor tx) throws TopiaException { + public List<O> findMultipleResult(TopiaContext tx) throws TopiaException { final List<O> result = new ArrayList<O>(); -// tx.getEntityManager().doWork(new Work() { -// -// @Override -// public void execute(Connection connection) throws SQLException { -// -// PreparedStatement ps = prepareQuery(connection); -// try { -// ResultSet set = ps.executeQuery(); -// -// findMultipleResult(result, set); -// -// } catch (Exception e) { -// throw new TopiaRuntimeException("Could not execute query", e); -// } finally { -// ps.close(); -// } -// } -// }); + tx.doSQLWork(new TopiaSQLWork() { + + @Override + public void execute(Connection connection) throws SQLException { + + PreparedStatement ps = prepareQuery(connection); + try { + ResultSet set = ps.executeQuery(); + + findMultipleResult(result, set); + + } catch (Exception e) { + throw new TopiaRuntimeException("Could not execute query", e); + } finally { + ps.close(); + } + } + }); return result; } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLWork.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLWork.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLWork.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -0,0 +1,48 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; + +import java.sql.Connection; +import java.sql.SQLException; + +/** + * Interface used for any native SQL batch. This interface is highly inspired + * of org.hibernate.jdbc.Work. + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + * @since 3.0 + */ +public interface TopiaSQLWork { + + /** + * Execute the discrete work encapsulated by this work instance using the + * supplied connection. + * + * @param connection The connection on which to perform the work. + * @throws SQLException Thrown during execution of the underlying JDBC + * interaction. + */ + void execute(Connection connection) throws SQLException; + +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLWork.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -35,6 +35,7 @@ * by ToPIA * * @author Arnaud Thimel <thimel(a)codelutin.com> + * @since 3.0 */ public interface TopiaSpecificUtil { @@ -47,7 +48,7 @@ * @return true if the table exists on storage * @see TopiaContext#isSchemaExist(Class) */ - boolean isSchemaExist(Class<?> clazz); + boolean isTableExists(Class<?> clazz); /** * Implementation-dependent method to create the schema on storage. This is @@ -108,4 +109,11 @@ @Deprecated void importXML(TopiaContextImplementor context, List<Element> elements); + /** + * Runs the given SQL work on the current context + * + * @param sqlWork the SQL work instance to execute + */ + void doSQLWork(TopiaContextImplementor context, TopiaSQLWork sqlWork); + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -190,150 +190,4 @@ return ids; } -// /** -// * Test si une entite donnee correspondant a une configuration existe en -// * base. -// * -// * @param configuration la configuration hibernate -// * @param entityName le nom de l'entite a tester -// * @return <tt>true</tt> si le schema de la table existe -// */ -// public static boolean isSchemaExist(Configuration configuration, -// String entityName) { -// -// boolean exist = false; -// -// try { -// PersistentClass classMapping = -// configuration.getClassMapping(entityName); -// if (classMapping == null) { -// if (log.isInfoEnabled()) { -// Iterator<?> itr = configuration.getClassMappings(); -// while (itr.hasNext()) { -// log.info("available mapping " + itr.next()); -// } -// } -// throw new IllegalArgumentException( -// "could not find entity with name " + entityName); -// } -// Table testTable = classMapping.getTable(); -// -// if (testTable == null) { -// throw new IllegalArgumentException( -// "could not find entity with name " + entityName); -// } -// ConnectionProvider connectionProvider = -// ConnectionProviderFactory.newConnectionProvider( -// configuration.getProperties()); -// -// Dialect dialect = Dialect.getDialect(configuration.getProperties()); -// -// Connection connection = null; -// try { -// connection = connectionProvider.getConnection(); -// -// DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); -// -// TableMetadata tmd = meta.getTableMetadata( -// testTable.getName(), testTable.getSchema(), -// testTable.getCatalog(), testTable.isQuoted()); -// -// if (tmd != null) { -// //table exist -// exist = true; -// } -// } finally { -// if (connection != null) { -// connection.close(); -// } -// } -// -// } catch (SQLException e) { -// log.error("Cant connect to database", e); -// } -// -// return exist; -// } -// -// /** -// * Test if the db associated to the given {@code configuration} contaisn any of -// * the dealed entities. -// * -// * @param configuration hibernate db configuration -// * @return {@code true} if there is no schema for any of the dealed entities, -// * {@code false} otherwise. -// * @since 2.5.3 -// */ -// public static boolean isSchemaEmpty(Configuration configuration) { -// -// try { -// -// ConnectionProvider connectionProvider = -// ConnectionProviderFactory.newConnectionProvider( -// configuration.getProperties()); -// -// Dialect dialect = Dialect.getDialect(configuration.getProperties()); -// -// Connection connection = null; -// try { -// connection = connectionProvider.getConnection(); -// -// DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); -// -// Iterator<?> itr = configuration.getClassMappings(); -// while (itr.hasNext()) { -// PersistentClass classMapping = (PersistentClass) itr.next(); -// Table testTable = classMapping.getTable(); -// -// if (testTable == null) { -// throw new IllegalArgumentException( -// "could not find entity with name " + -// classMapping.getClassName()); -// } -// -// -// TableMetadata tmd = meta.getTableMetadata( -// testTable.getName(), testTable.getSchema(), -// testTable.getCatalog(), testTable.isQuoted()); -// -// if (tmd != null) { -// //table exist -// -// -// if (log.isDebugEnabled()) { -// log.debug("Existing table found " + -// testTable.getName() + " for entity " + -// classMapping.getClassName() + -// ", db is not empty."); -// } -// -// return false; -// } -// } -// -// } finally { -// if (connection != null) { -// connection.close(); -// } -// } -// -// } catch (SQLException e) { -// log.error("Cant connect to database", e); -// } -// -// return true; -// } - - /** - * Return hibernate schema name - * - * @param config of hibernate - * @return schema name - */ - public static String getSchemaName() { - return "azerty"; - } -// public static String getSchemaName(Configuration config) { -// return config.getProperty(TopiaContextFactory.CONFIG_DEFAULT_SCHEMA); -// } } Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -110,10 +110,10 @@ Map<String, Object> hibernateProperties = Maps.newHashMap(properties); boolean useHibernateMapping = false; - // Convert everything from topia.connection.* to hibernate.connection.* + // Convert everything from topia.* to hibernate.* // and find out if use orm (jpa) or legacy hibernate mapping files for (String key : properties.keySet()) { - if (key.startsWith("topia.connection.")) { + if (key.startsWith("topia.")) { Object value = properties.get(key); String hibernateKey = "hibernate." + key.substring(6); hibernateProperties.put(hibernateKey, value); Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -32,6 +32,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; import org.hibernate.ejb.EntityManagerImpl; +import org.hibernate.jdbc.Work; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; @@ -41,6 +42,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.topia.framework.TopiaSpecificUtil; import javax.persistence.EntityManager; @@ -86,7 +88,7 @@ } @Override - public boolean isSchemaExist(Class<?> clazz) { + public boolean isTableExists(Class<?> clazz) { String entityName = clazz.getName(); boolean result = false; @@ -157,6 +159,9 @@ if (entityManager instanceof EntityManagerImpl) { Session session = ((EntityManagerImpl) entityManager).getSession(); session.replicate(entity, ReplicationMode.EXCEPTION); + } else { + throw new UnsupportedOperationException( + "Cannot find Hibernate session to receive replicated entity"); } } catch (TopiaException te) { throw new TopiaRuntimeException("Unable to receive replicated entity", te); @@ -215,4 +220,28 @@ // throw new TopiaRuntimeException("Unable to export elements to XML", te); // } } + + @Override + public void doSQLWork(TopiaContextImplementor context, final TopiaSQLWork sqlWork) { + Work hibernateWork = new Work() { + + @Override + public void execute(Connection connection) throws SQLException { + sqlWork.execute(connection); + } + }; + + try { + EntityManager entityManager = context.getEntityManager(); + if (entityManager instanceof EntityManagerImpl) { + Session session = ((EntityManagerImpl) entityManager).getSession(); + session.doWork(hibernateWork); + } else { + throw new UnsupportedOperationException( + "Cannot find Hibernate session to run the SQL work"); + } + } catch (TopiaException te) { + throw new TopiaRuntimeException("Unable to run SQL work", te); + } + } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -26,10 +26,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -146,7 +146,7 @@ return doMigrate; } - public void executeSQL(TopiaContextImplementor tx, String... sqls) + public void executeSQL(TopiaContext tx, String... sqls) throws TopiaException { executeSQL(tx, false, false, sqls); } @@ -161,14 +161,14 @@ * @throws TopiaException if any pb * @since 2.3.0 */ - public void executeSQL(TopiaContextImplementor tx, + public void executeSQL(TopiaContext tx, final boolean showSql, final boolean showProgression, final String... sqls) throws TopiaException { if (log.isInfoEnabled()) { - log.info(_("topia.migration.start.sqls", sqls.length)); + log.info(String.format("Will execute %d requests...", sqls.length)); } if (showSql) { StringBuilder buffer = new StringBuilder(); @@ -183,8 +183,9 @@ "--------------------------------------------------------------------------------\n" ); } - tx.getEntityManager().doWork(new Work() { + tx.doSQLWork(new TopiaSQLWork() { + @Override public void execute(Connection connection) throws SQLException { int index = 0; @@ -196,7 +197,7 @@ String message = ""; if (showProgression) { - message = _("topia.migration.start.sql", index, max); + message = String.format("Executing request [%d/%d]", index, max); } if (showSql) { message += "\n" + sql; @@ -214,7 +215,7 @@ } if (log.isDebugEnabled()) { String message; - message = _("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); + message = String.format("Request [%d/%d] executed in %ss.", index, max, StringUtil.convertTime(System.nanoTime() - t0)); log.debug(message); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -31,7 +31,6 @@ import org.hibernate.cfg.Configuration; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextAdapter; import org.nuiton.topia.event.TopiaContextEvent; @@ -39,7 +38,6 @@ import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.migration.mappings.TMSVersion; import org.nuiton.topia.migration.mappings.TMSVersionDAO; import org.nuiton.util.Version; @@ -533,10 +531,9 @@ try { // on detecte si la table de versionning existe - versionTableExist = - TopiaUtil.isSchemaExist(versionConfiguration, - TMSVersion.class.getName()); + versionTableExist = rootContext.isSchemaExist(TMSVersion.class); + // check if at least one class exists in db @@ -554,34 +551,10 @@ log.warn("Version not found on table " + TMSVersionDAO.TABLE_NAME); } } - return; } - // try with legacy table tmsVersion - Configuration conf = new Configuration(); - conf.addXML(TMSVersionDAO.LEGACY_MAPPING); - - legacyVersionConfiguration = createHibernateConfiguration(conf); - legacyVersionTableExist = - TopiaUtil.isSchemaExist(legacyVersionConfiguration, - TMSVersion.class.getName()); - - if (legacyVersionTableExist) { - - if (log.isDebugEnabled()) { - log.debug("Legacy : detected " + TMSVersionDAO.LEGACY_TABLE_NAME + " table"); - } - - // recuperation de la version de la base - v = getVersion(legacyVersionTableExist, TMSVersionDAO.LEGACY_TABLE_NAME); - - if (v != null) { - - if (log.isDebugEnabled()) { - log.debug("Legacy : " + _("topia.migration.detected.db.version", v)); - } - } - } + } catch (TopiaException te) { + log.error("Unable to detect version", te); } finally { if (v == null) { @@ -609,20 +582,8 @@ * @since 2.5.3 */ protected boolean detectDbEmpty() { - - - try { - boolean result; - // get db real hibernate configuration - Configuration rootConfiguration = - rootContext.getHibernateConfiguration(); - - result = TopiaUtil.isSchemaEmpty(rootConfiguration); - return result; - } catch (TopiaNotFoundException e) { - throw new RuntimeException(e); - } - + boolean result = rootContext.isSchemaEmpty(); + return result; } protected Version getVersion(boolean versionTableExist, String tableName) { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2012-05-29 14:14:36 UTC (rev 2549) @@ -26,21 +26,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.Criteria; import org.hibernate.HibernateException; -import org.hibernate.Session; import org.hibernate.cfg.Configuration; -import org.hibernate.jdbc.Work; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -62,19 +59,21 @@ public static final String TABLE_NAME = "tms_version"; - public static TMSVersion get(TopiaContext tx) throws TopiaException { +// public static TMSVersion get(TopiaContext tx) throws TopiaException { +// +// try { +// EntityManager session = ((TopiaContextImplementor) tx).getEntityManager(); +// TypedQuery<TMSVersion> query = session.createQuery( +// "from " + TMSVersion.class.getName(), TMSVersion.class); +// +// List<TMSVersion> list = query.getResultList(); +// TMSVersion result = list.isEmpty() ? null : list.get(0); +// return result; +// } catch (HibernateException e) { +// throw new TopiaException("Could not obtain version", e); +// } +// } - try { - EntityManager session = ((TopiaContextImplementor) tx).getEntityManager(); - Criteria criteria = session.createCriteria(TMSVersion.class); - List<?> list = criteria.list(); - TMSVersion result = list.isEmpty() ? null : (TMSVersion) list.get(0); - return result; - } catch (HibernateException e) { - throw new TopiaException("Could not obtain version", e); - } - } - public static void createTable(Configuration configuration) { // creer le schema en base // dans la configuration il n'y a que la table version @@ -116,9 +115,11 @@ public static void deleteAll(TopiaContext tx) throws TopiaException { try { EntityManager session = ((TopiaContextImplementor) tx).getEntityManager(); - Criteria criteria = session.createCriteria(TMSVersion.class); - List<?> list = criteria.list(); - for (Object o : list) { + TypedQuery<TMSVersion> query = session.createQuery( + "from " + TMSVersion.class.getName(), TMSVersion.class); + + List<TMSVersion> list = query.getResultList(); + for (TMSVersion o : list) { session.remove(o); } } catch (HibernateException e) { @@ -126,33 +127,18 @@ } } - public static final String LEGACY_MAPPING = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<!DOCTYPE hibernate-mapping PUBLIC \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\" \"classpath://org/hibernate/hibernate-mapping-3.0.dtd\">\n" + - "<hibernate-mapping>\n" + - " <class name=\"" + TMSVersion.class.getName() + "\" table=\"" + LEGACY_TABLE_NAME + "\">\n" + - " <id column=\"" + TMSVersion.PROPERTY_VERSION + "\" name=\"" + TMSVersion.PROPERTY_VERSION + "\"/>\n" + - " </class>\n" + - "</hibernate-mapping>"; - public static Version getVersion(TopiaContext tx, String tableName) { - try { - TopiaContextImplementor txImpl = (TopiaContextImplementor) tx; - Configuration hibernateConfiguration = txImpl.getHibernateConfiguration(); - // Get schema name - String schemaName = TopiaUtil.getSchemaName(hibernateConfiguration); + // Get schema name + String schemaName = tx.getSchemaName(); - GetVersionWork work = new GetVersionWork(schemaName, tableName); - txImpl.getEntityManager().doWork(work); - Version v = work.getVersion(); - return v; - } catch (TopiaException e) { - throw new TopiaRuntimeException("Can't obtain dbVersion for reason " + e.getMessage(), e); - } + GetVersionWork work = new GetVersionWork(schemaName, tableName); + tx.doSQLWork(work); + Version v = work.getVersion(); + return v; } - public static class GetVersionWork implements Work { + public static class GetVersionWork implements TopiaSQLWork { protected Version version; Modified: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties 2012-05-29 14:14:36 UTC (rev 2549) @@ -1,7 +1,6 @@ topia.migration.available.versions=Available versions \: %1$s topia.migration.db.not.versionned=Database version not found, so database schema is considered as V0 topia.migration.detected.db.version=detected database version \: %1$s -topia.migration.end.sql=Request [%1$-4s/%2$-4s] executed in %3$s. topia.migration.migrate.versions=Versions to apply \: %1$s topia.migration.migration.incomplete=Database migration not succesfully ended \! topia.migration.saving.db.version=Saving new database version \: %1$s @@ -10,5 +9,3 @@ topia.migration.skip.migration.no.version.to.apply=No version to apply, no migration needed. topia.migration.start.migrate=Start migration to version %1$s topia.migration.start.migration=Starting Topia Migration Service - Application version \: %1$s, Database version \: %2$s -topia.migration.start.sql=Executing request [%1$-4s/%2$-4s] -topia.migration.start.sqls=Will execute %1$s requests... Modified: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties 2012-05-29 14:14:36 UTC (rev 2549) @@ -1,7 +1,6 @@ topia.migration.available.versions=Versiones detectadas \: %1$s topia.migration.db.not.versionned=La base de datos no tiene versión, se considera como la versión 0. topia.migration.detected.db.version=Versión de la base \: %1$s -topia.migration.end.sql=Consulta [%1$-4s/%2$-4s] ejecutada en %3$s. topia.migration.migrate.versions=Actualización para instalar \: %1$s topia.migration.migration.incomplete=\\u00a1La migración de la base de datos ha fallado o se ha cancelado\! topia.migration.saving.db.version=Copia de seguridad de la nueva versión de la base \: %1$s @@ -10,5 +9,3 @@ topia.migration.skip.migration.no.version.to.apply=No hay versión a aplicar, no es necesaria ninguna migración. topia.migration.start.migrate=Inicio de la actualización hacia la versión %1$s topia.migration.start.migration=Inicio del servicio de actualización - versión de la aplicación \: %1$s, versión de la base \: %2$s -topia.migration.start.sql=Ejecución de la consulta [%1$-4s/%2$-4s] -topia.migration.start.sqls=Se va a ejecutar %1$s consulta(s)... Modified: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties 2012-05-29 14:14:36 UTC (rev 2549) @@ -1,7 +1,6 @@ topia.migration.available.versions=Versions détectées \: %1$s topia.migration.db.not.versionned=La base de données n'est pas versionnée, elle sera considérée en version 0. topia.migration.detected.db.version=Version de base détectée \: %1$s -topia.migration.end.sql=Requête [%1$-4s/%2$-4s] exécutée en %3$s. topia.migration.migrate.versions=Mises à jour à installer \: %1$s topia.migration.migration.incomplete=La migration de la base s'est mal déroulée ou a été annulée\! topia.migration.saving.db.version=Sauvegarde de la nouvelle version de la base \: %1$s @@ -10,5 +9,3 @@ topia.migration.skip.migration.no.version.to.apply=Aucune version à appliquer, aucune migration nécessaire. topia.migration.start.migrate=Démarrage de la mise à jour vers la version %1$s topia.migration.start.migration=Démarrage du service de mise à jour - version de l'application \: %1$s, version de la base \: %2$s -topia.migration.start.sql=Execution de la requête [%1$-4s/%2$-4s] -topia.migration.start.sqls=Va executer %1$s requête(s)... Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-05-29 14:08:35 UTC (rev 2548) +++ trunk/topia-service-security/pom.xml 2012-05-29 14:14:36 UTC (rev 2549) @@ -45,16 +45,16 @@  <dependency> <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> + <artifactId>topia-persistence-hibernate</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - </dependency> +  +  +  +  +  +  <dependency> <groupId>org.nuiton</groupId> @@ -157,6 +157,12 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> </dependencies> </plugin>

1 0

r2548 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/event topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/resources/org/nuiton/topia/persistence topia-persistence/src/site/rst/devel topia-persistence-hibernate topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework topia-persistence-hibernate/src/main/java/or
by athimel＠users.nuiton.org May 29, 2012

May 29, 2012

Author: athimel Date: 2012-05-29 16:08:35 +0200 (Tue, 29 May 2012) New Revision: 2548 Url: http://nuiton.org/repositories/revision/topia/2548 Log: Set common svn properties & Update file headers Modified: trunk/topia-persistence-hibernate/LICENSE.txt trunk/topia-persistence-hibernate/README.txt trunk/topia-persistence-hibernate/changelog.txt trunk/topia-persistence-hibernate/pom.xml trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java trunk/topia-persistence-hibernate/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_en_GB.properties trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_es_ES.properties trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_fr_FR.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-replication.properties trunk/topia-persistence-tck/LICENSE.txt trunk/topia-persistence-tck/README.txt trunk/topia-persistence-tck/changelog.txt trunk/topia-persistence-tck/pom.xml trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.zargo trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/DummyPersistenceProvider.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/events/VetoableEventTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/AbstractMappingTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/EntityWithBasicUniqueFieldsTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyUniqueTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyWithRoleNamedUniqueTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyUniqueTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyWithRoleNamedUniqueTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/ElementCollectionTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/BiDirectionalOneToManyCompositionTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/OneToManyCompositionTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyIndexedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/ReplicationModelFixtures.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaDatabaseReplication.java trunk/topia-persistence-tck/src/test/resources/META-INF/persistence2.xml trunk/topia-persistence-tck/src/test/resources/META-INF/services/javax.persistence.spi.PersistenceProvider trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaSchemaListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaH2Util.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java trunk/topia-persistence/src/main/resources/org/nuiton/topia/persistence/TopiaEntityAbstract-orm.xml trunk/topia-persistence/src/site/rst/devel/Topia3Migration.rst Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaSchemaListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaSchemaListener.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaSchemaListener.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.event; import java.util.EventListener; @@ -13,7 +36,7 @@ * </ul> * * @author Arnaud Thimel <thimel(a)codelutin.com> - * @version $Id: TopiaContextListener.java 2142 2010-11-18 16:17:42Z tchemit $ + * @version $Id$ */ public interface TopiaSchemaListener extends EventListener { Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaSchemaListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; import com.google.common.base.Function; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaH2Util.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaH2Util.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaH2Util.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; import org.nuiton.topia.TopiaException; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaH2Util.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; import org.apache.commons.lang3.tuple.Pair; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; import com.google.common.base.Predicate; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.framework; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSpecificUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.generator; import com.google.common.base.Function; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.persistence; import org.apache.commons.logging.Log; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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.persistence; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/resources/org/nuiton/topia/persistence/TopiaEntityAbstract-orm.xml =================================================================== --- trunk/topia-persistence/src/main/resources/org/nuiton/topia/persistence/TopiaEntityAbstract-orm.xml 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/main/resources/org/nuiton/topia/persistence/TopiaEntityAbstract-orm.xml 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"> <mapped-superclass class="org.nuiton.topia.persistence.TopiaEntityAbstract" access="FIELD"> <attributes> Property changes on: trunk/topia-persistence/src/main/resources/org/nuiton/topia/persistence/TopiaEntityAbstract-orm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/site/rst/devel/Topia3Migration.rst =================================================================== --- trunk/topia-persistence/src/site/rst/devel/Topia3Migration.rst 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence/src/site/rst/devel/Topia3Migration.rst 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * ToPIA :: Persistence +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * 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% +.. - List of notable changes ======================= Property changes on: trunk/topia-persistence/src/site/rst/devel/Topia3Migration.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Hibernate + * $Id$ + * $HeadURL$ + * %% + * 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.framework; import org.apache.commons.logging.Log; Property changes on: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Hibernate + * $Id$ + * $HeadURL$ + * %% + * 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.persistence; import com.google.common.base.Function; Property changes on: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernatePersistenceProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Hibernate + * $Id$ + * $HeadURL$ + * %% + * 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.persistence; import org.apache.commons.logging.Log; Property changes on: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_es_ES.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-hibernate/src/main/resources/i18n/topia-persistence-hibernate_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +### +# #%L +# ToPIA :: Persistence :: Hibernate +# $Id$ +# $HeadURL$ +# %% +# 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% +### # Proprietes par defaut pour une base de donnees de type H2 et le model it hibernate.hbm2ddl.auto=update hibernate.show_sql=false Property changes on: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-it.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +### +# #%L +# ToPIA :: Persistence :: Hibernate +# $Id$ +# $HeadURL$ +# %% +# 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% +### # Proprietes par defaut pour une base de donnees de type H2 et le model legacy hibernate.hbm2ddl.auto=update hibernate.show_sql=false Property changes on: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-legacy.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +### +# #%L +# ToPIA :: Persistence :: Hibernate +# $Id$ +# $HeadURL$ +# %% +# 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% +### # Proprietes par defaut pour une base de donnees de type H2 et le model mapping hibernate.hbm2ddl.auto=update #hibernate.show_sql=true Property changes on: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-replication.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-replication.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-replication.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +### +# #%L +# ToPIA :: Persistence :: Hibernate +# $Id$ +# $HeadURL$ +# %% +# 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% +### # Proprietes par defaut pour une base de donnees de type H2 et le model legacy hibernate.hbm2ddl.auto=update hibernate.show_sql=false Property changes on: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-replication.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test4; /** Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test9; /** Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties =================================================================== --- trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -2,8 +2,8 @@ # #%L # ToPIA :: Persistence # -# $Id: topia-tck-it.properties 2451 2012-05-09 14:37:49Z athimel $ -# $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-persistence-tck/src/main/xmi/to… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2004 - 2010 CodeLutin # %% Property changes on: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/src/main/xmi/topia-tck-legacy.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties =================================================================== --- trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-29 14:08:35 UTC (rev 2548) @@ -2,8 +2,8 @@ # #%L # ToPIA :: Persistence # -# $Id: topiatest.properties 2445 2012-05-09 13:48:32Z athimel $ -# $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-persistence-tck/src/main/xmi/to… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2004 - 2010 CodeLutin # %% Property changes on: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/DummyPersistenceProvider.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/DummyPersistenceProvider.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/DummyPersistenceProvider.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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; import org.apache.commons.lang3.tuple.Pair; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/DummyPersistenceProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.it; import org.nuiton.topia.persistence.TopiaEntity; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/TopiaDatabaseIt.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/events/VetoableEventTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/events/VetoableEventTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/events/VetoableEventTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.it.events; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/events/VetoableEventTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.legacy; import org.nuiton.topia.persistence.TopiaEntity; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/TopiaDatabaseLegacy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/AbstractMappingTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/AbstractMappingTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/AbstractMappingTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping; import org.junit.Rule; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/AbstractMappingTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping; import org.nuiton.topia.persistence.TopiaEntity; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/TopiaDatabaseMapping.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test1; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test1; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/BiDirectionalOneToManyRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test1; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test1; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test1/SimpleOneToManyRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/EntityWithBasicUniqueFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/EntityWithBasicUniqueFieldsTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/EntityWithBasicUniqueFieldsTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test11; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/EntityWithBasicUniqueFieldsTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyUniqueTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyUniqueTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyUniqueTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test11; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyUniqueTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyWithRoleNamedUniqueTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyWithRoleNamedUniqueTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyWithRoleNamedUniqueTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test11; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleManyToManyWithRoleNamedUniqueTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyUniqueTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyUniqueTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyUniqueTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test11; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyUniqueTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyWithRoleNamedUniqueTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyWithRoleNamedUniqueTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyWithRoleNamedUniqueTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test11; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test11/SimpleOneToManyWithRoleNamedUniqueTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test12; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test13; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test2; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test2; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/BiDirectionalManyToOneRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test2; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test2; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test2/SimpleManyToOneRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test3; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test3; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/BiDirectionalManyToManyRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test3; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test3; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test3/SimpleManyToManyRelationWithRoleNamedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/ElementCollectionTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/ElementCollectionTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/ElementCollectionTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test4; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/ElementCollectionTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/BiDirectionalOneToManyCompositionTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/BiDirectionalOneToManyCompositionTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/BiDirectionalOneToManyCompositionTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test5; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/BiDirectionalOneToManyCompositionTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/OneToManyCompositionTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/OneToManyCompositionTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/OneToManyCompositionTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test5; import junit.framework.Assert; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test5/OneToManyCompositionTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyIndexedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyIndexedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyIndexedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test6; import com.google.common.collect.Lists; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyIndexedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test6; import com.google.common.collect.Lists; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test6/SimpleOneToManyWithRoleNamedIndexedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test7; import com.google.common.collect.Lists; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.mapping.test7; import com.google.common.collect.Lists; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/ReplicationModelFixtures.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/ReplicationModelFixtures.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/ReplicationModelFixtures.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.replication; import org.nuiton.topia.TopiaContext; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/ReplicationModelFixtures.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaDatabaseReplication.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaDatabaseReplication.java 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaDatabaseReplication.java 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,3 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * 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.tck.replication; import org.junit.runner.Description; Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/replication/TopiaDatabaseReplication.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/src/test/resources/META-INF/persistence2.xml =================================================================== --- trunk/topia-persistence-tck/src/test/resources/META-INF/persistence2.xml 2012-05-28 10:44:08 UTC (rev 2547) +++ trunk/topia-persistence-tck/src/test/resources/META-INF/persistence2.xml 2012-05-29 14:08:35 UTC (rev 2548) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> <persistence-unit name="topia" transaction-type="RESOURCE_LOCAL"> <class>org.nuiton.topia.test.entities.PersonImpl</class> Property changes on: trunk/topia-persistence-tck/src/test/resources/META-INF/persistence2.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence-tck/src/test/resources/META-INF/services/javax.persistence.spi.PersistenceProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2547 - in trunk: . topia-persistence/src/it/ANOMALIE-1640 topia-persistence/src/site/rst/user topia-persistence-tck topia-service-history topia-service-security topia-soa topia-tutorial
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 12:44:08 +0200 (Mon, 28 May 2012) New Revision: 2547 Url: http://nuiton.org/repositories/revision/topia/2547 Log: use eugene-m-p fix some docs (usage of vm when required) Added: trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst.vm trunk/topia-persistence/src/site/rst/user/howto.rst.vm trunk/topia-persistence/src/site/rst/user/start.rst.vm Removed: trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst trunk/topia-persistence/src/site/rst/user/howto.rst trunk/topia-persistence/src/site/rst/user/start.rst Modified: trunk/pom.xml trunk/topia-persistence-tck/pom.xml trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml trunk/topia-tutorial/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -381,7 +381,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -109,7 +109,7 @@ <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> Deleted: trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst =================================================================== --- trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst 2012-05-28 10:44:08 UTC (rev 2547) @@ -1,111 +0,0 @@ -.. - -.. * #%L -.. * ToPIA :: Persistence -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - -Génération des modèles ----------------------- - - -Le module "topia-persistence" de topia est capable de -générer la persistence à partir d'un modèle UML. - -Nous allons détailler ici comme inclure la génération dans le -cycle de compilation maven. - - -Architecture maven ------------------- - -+---------------------------------+-----------------------------------------+ -| src/main/xmi/mymodel.zargo | exemple de modele UML avec argoUML | -+---------------------------------+-----------------------------------------+ -| src/main/xmi/mymodel.properties | fichier de propriétés attaché au modele | -+---------------------------------|-----------------------------------------+ - - -Configuration du pom.xml ------------------------- - -Pour générer les sources dans la phase "generate-sources" de maven, et utiliser -les sources générées, et faut configurer le pom. - -Plugin eugene -============= - -:: - -<plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> -  - <version>1.0.0</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirUml>src/main/xmi</srcDirUml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> - <fullPackagePath>org.company.package</fullPackagePath> - <extractedPackages>org.company.package</extractedPackages> - <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-sources/java</destDirGen> - <defaultPackage>org.company.package</defaultPackage> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> -  - <version>2.2.0</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</plugin> - -Pour plus d'information à propos d'eugene, merci de consulter le site : -http://maven-site.nuiton.org/eugene/ - -Dépendances du projet -===================== - -Il faut enfin ajouter "topia-persistence" en dépendance du projet : - -:: - -<dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> -  - <version>2.2.0</version> - <scope>compile</scope> -</dependency> Copied: trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst.vm (from rev 2546, trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst) =================================================================== --- trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst.vm (rev 0) +++ trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst.vm 2012-05-28 10:44:08 UTC (rev 2547) @@ -0,0 +1,109 @@ +.. - +.. * #%L +.. * ToPIA :: Persistence +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Génération des modèles +---------------------- + + +Le module "topia-persistence" de topia est capable de +générer la persistence à partir d'un modèle UML. + +Nous allons détailler ici comme inclure la génération dans le +cycle de compilation maven. + + +Architecture maven +------------------ + ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.zargo | exemple de modele UML avec argoUML | ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.properties | fichier de propriétés attaché au modele | ++---------------------------------|-----------------------------------------+ + + +Configuration du pom.xml +------------------------ + +Pour générer les sources dans la phase "generate-sources" de maven, et utiliser +les sources générées, et faut configurer le pom. + +Plugin eugene +============= + +:: + +<plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirUml>src/main/xmi</srcDirUml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.company.package</fullPackagePath> + <extractedPackages>org.company.package</extractedPackages> + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>org.company.package</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> +  + <version>2.2.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</plugin> + +Pour plus d'information à propos d'eugene, merci de consulter le site : +http://maven-site.nuiton.org/eugene/ + +Dépendances du projet +===================== + +Il faut enfin ajouter "topia-persistence" en dépendance du projet : + +:: + +<dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> +</dependency> Property changes on: trunk/topia-persistence/src/site/rst/user/ModelGeneration.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/topia-persistence/src/site/rst/user/howto.rst =================================================================== --- trunk/topia-persistence/src/site/rst/user/howto.rst 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-persistence/src/site/rst/user/howto.rst 2012-05-28 10:44:08 UTC (rev 2547) @@ -1,155 +0,0 @@ -.. - -.. * #%L -.. * ToPIA :: Persistence -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric -.. * %% -.. * 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% -.. - -How to -====== - -Ce document a pour objectif de prendre en main le framework Topia. Le document -est constitué de 4 parties, la modélisation, la génération, la configuration et -l'utilisation. - -Modélisation ------------- - -La première étape constiste à réaliser le modèle UML soit avec Argouml -(http://argouml.tigris.org) soit avec Poséidon (http://www.gentleware.com) - -Le stérotype «entity» sur les classes permet de préciser que la classe est -persistée par Topia. D'autre stérotypes (extern, service, ...) sont disponibles -mais ne sont pas présentés. - -Le fichier de modélisation peut être complété par un fichier de configuration -nommé <nom fichier modélisation>.properties. Il contient des informations -techniques propres aux librairies utilisé par Topia. - -Exemple : - -:: - - # Précise comment est mappé un type - # model.tagvalue.<type java>=<type base de donnée> - model.tagvalue.java.lang.String=text - - # Précise le schema de la base de données par défaut - # model.tagvalue.dbSchema=<nom schéma> - model.tagvalue.dbSchema=test - - # Précise l'entête de l'ensemble des fichiers générés - # model.tagvalue.copyright=<valeur> - model.tagvalue.copyright=/* *##%\n Copyright (C) 2011 Code Lutin\n *##% */ - - # Force le chargement d'un attribut - # <nom paquetage>.<nom entité>.attribute.<nom attribut>.tagvalue.lazy=false - org.codelutin.Person.attribute.association.tagvalue.lazy=false - -Génération ----------- - -La génération des fichiers Topia se font par l'utilisation du plugin maven -Eugene_. Ce plugin est disponible sur le repository central. - -Configuration du plugin maven : - -:: - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>2.3.2</version> - <executions> - <execution> - <phase>process-sources</phase> -  - <configuration> - <inputs>zargo</inputs> - <fullPackagePath>org.nuiton.topiatest</fullPackagePath> - <defaultPackage>org.nuiton.topiatest</defaultPackage> - <extractedPackages>org.nuiton.topiatest</extractedPackages> - <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>2.5.2</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - -Le plugin utilise Eugene_ avec les templates de génération de Topia, le -fichier argouml ou poséidon doit se trouver dans le répertoire -``src/main/xmi``. Les fichiers sont générés dans le répertoire -``target/generated-sources/java``. Il faut préciser au plugin les paquetages -à traiter avec le ``defaultPackage`` et ``extractedPackages``. - -Ajout dans des dépendances de Topia pour la compilation des fichiers générés : - -:: - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>2.5.2</version> - <scope>compile</scope> - </dependency> - -Pour une classe modélisée, nous retrouvons 6 fichiers : - * Une interface - * Une classe abstraite - * Une implantation - * Une configuration hibernate - * Un DAO abstrait - * Une implantation du DAO - -Une classe Helper est aussi générée, permettant l'accès à l'ensemble des DAO. - -Configuration -------------- - -Un fichier contenant les informations de connexion à la base de données et de -configuration de Topia doit être créé au niveau des ressources du projet. -Par convention, ce fichier est nommé ``TopiaContextImpl.properties``. - - -Utilisation ------------ - -Implantation des méthodes -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Si des méthodes ont été définies dans le modèle de données, il faut créer -l'implantation correspondante. Le paquetage doit porter le même nom que celui de -la génération. - - - -.. _Eugene: http://maven-site.nuiton.org/eugene/ Copied: trunk/topia-persistence/src/site/rst/user/howto.rst.vm (from rev 2546, trunk/topia-persistence/src/site/rst/user/howto.rst) =================================================================== --- trunk/topia-persistence/src/site/rst/user/howto.rst.vm (rev 0) +++ trunk/topia-persistence/src/site/rst/user/howto.rst.vm 2012-05-28 10:44:08 UTC (rev 2547) @@ -0,0 +1,155 @@ +.. - +.. * #%L +.. * ToPIA :: Persistence +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric +.. * %% +.. * 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% +.. - +How to +====== + +Ce document a pour objectif de prendre en main le framework Topia. Le document +est constitué de 4 parties, la modélisation, la génération, la configuration et +l'utilisation. + +Modélisation +------------ + +La première étape constiste à réaliser le modèle UML soit avec Argouml +(http://argouml.tigris.org) soit avec Poséidon (http://www.gentleware.com) + +Le stérotype «entity» sur les classes permet de préciser que la classe est +persistée par Topia. D'autre stérotypes (extern, service, ...) sont disponibles +mais ne sont pas présentés. + +Le fichier de modélisation peut être complété par un fichier de configuration +nommé <nom fichier modélisation>.properties. Il contient des informations +techniques propres aux librairies utilisé par Topia. + +Exemple : + +:: + + # Précise comment est mappé un type + # model.tagvalue.<type java>=<type base de donnée> + model.tagvalue.java.lang.String=text + + # Précise le schema de la base de données par défaut + # model.tagvalue.dbSchema=<nom schéma> + model.tagvalue.dbSchema=test + + # Précise l'entête de l'ensemble des fichiers générés + # model.tagvalue.copyright=<valeur> + model.tagvalue.copyright=/* *##%\n Copyright (C) 2011 Code Lutin\n *##% */ + + # Force le chargement d'un attribut + # <nom paquetage>.<nom entité>.attribute.<nom attribut>.tagvalue.lazy=false + org.codelutin.Person.attribute.association.tagvalue.lazy=false + +Génération +---------- + +La génération des fichiers Topia se font par l'utilisation du plugin maven +Eugene_. Ce plugin est disponible sur le repository central. + +Configuration du plugin maven : + +:: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <executions> + <execution> + <phase>process-sources</phase> +  + <configuration> + <inputs>zargo</inputs> + <fullPackagePath>org.nuiton.topiatest</fullPackagePath> + <defaultPackage>org.nuiton.topiatest</defaultPackage> + <extractedPackages>org.nuiton.topiatest</extractedPackages> + <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>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + +Le plugin utilise Eugene_ avec les templates de génération de Topia, le +fichier argouml ou poséidon doit se trouver dans le répertoire +``src/main/xmi``. Les fichiers sont générés dans le répertoire +``target/generated-sources/java``. Il faut préciser au plugin les paquetages +à traiter avec le ``defaultPackage`` et ``extractedPackages``. + +Ajout dans des dépendances de Topia pour la compilation des fichiers générés : + +:: + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + +Pour une classe modélisée, nous retrouvons 6 fichiers : + * Une interface + * Une classe abstraite + * Une implantation + * Une configuration hibernate + * Un DAO abstrait + * Une implantation du DAO + +Une classe Helper est aussi générée, permettant l'accès à l'ensemble des DAO. + +Configuration +------------- + +Un fichier contenant les informations de connexion à la base de données et de +configuration de Topia doit être créé au niveau des ressources du projet. +Par convention, ce fichier est nommé ``TopiaContextImpl.properties``. + + +Utilisation +----------- + +Implantation des méthodes +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Si des méthodes ont été définies dans le modèle de données, il faut créer +l'implantation correspondante. Le paquetage doit porter le même nom que celui de +la génération. + + + +.. _Eugene: http://maven-site.nuiton.org/eugene/ Property changes on: trunk/topia-persistence/src/site/rst/user/howto.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/topia-persistence/src/site/rst/user/start.rst =================================================================== --- trunk/topia-persistence/src/site/rst/user/start.rst 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-persistence/src/site/rst/user/start.rst 2012-05-28 10:44:08 UTC (rev 2547) @@ -1,246 +0,0 @@ -.. - -.. * #%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% -.. - -================================ -Démarrer un projet ToPIA - Maven -================================ - -Comment démarrer un projet à partir de rien. - -Créer le projet -=============== - -Pour commencer, il faut créer un projet maven en respectant les conventions -habituelles. Partons d'un projet maven vide : - -:: - - mvn archetype:generate -DgroupId=com.masociete -DartifactId=monapplication -DarchetypeArtifactId=maven-archetype-archetype - -Ajoutez un dossier ``src/main/xmi``, c'est ici que nous allons placer le modèle. - -:: - - topia-tutorial - ├── pom.xml - └── src - ├── main - │ ├── java - │ │ └── org - │ │ └── nuiton - │ │ └── topia - │ │ └── tutorial - │ │ └── library - │ ├── resources - │ │ ├── library-config.properties - │ │ └── log4j.properties - │ └── xmi - │ ├── library.properties - │ └── library.zargo - └── test - ├── java - └── resources - -Dans le pom, on ajoute ToPIA en dépendance, et on configure la génération : - -:: - - <properties> - <topiaVersion>2.5.4</topiaVersion> - <eugeneVersion>2.3.3</eugeneVersion> - </properties> - - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> - - - <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.model</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - -Créer le modèle -=============== - -Utiliser ArgoUML pour décrire le modèle ---------------------------------------- - -Avec ArgoUML, créez un nouveau modèle et enregistrez-le dans ``xmi``. Nous -allons créer un modèle simplifié pour une application de gestion de -bibliothèque. - -Nous avons modélisé les entités ``Book`` et ``Author`` avec les champs -appropriés. Faites attention à bien placer les entités dans le bon package, sinon -elles ne seront pas générées. Pour que ToPIA sache que ces classes décrivent -des entités qui ont vocation à être sauvées en base, il faut leur ajouter le -stéréotype ``entity``. - -N'oubliez pas de donner un nom et une version au modèle. - -Les données associées aux éléments du modèle --------------------------------------------- - -Le modeleur n'est pas suffisant pour décrire toute les subtilités du modèle. -Le modèle se voulant indépendant de la plate-forme cible, on ne peut y inclure -directement des notions spécifiques à ToPIA. C'est pourquoi nous allons pouvoir -ajouter ces informations spécifiques via le fichier ``library-config.properties``. - - -C'est prêt ! -============ - -Il suffit de construire l'application avec maven. - -:: - - mvn compile - - -La compilation va provoquer la phase de génération. Si on examine le contenu -de notre dossier target : - -:: - - topia-tutorial - ├── pom.xml - ├── src - │ ├── main - │ │ ├── java - │ │ │ └── org - │ │ │ └── nuiton - │ │ │ └── topia - │ │ │ └── tutorial - │ │ │ └── library - │ │ ├── resources - │ │ │ ├── library-config.properties - │ │ │ └── log4j.properties - │ │ └── xmi - │ │ ├── library.properties - │ │ └── library.zargo - │ └── test - │ ├── java - │ └── resources - └── target - ├── classes - │ ├── library-config.properties - │ ├── log4j.properties - │ └── org - │ └── nuiton - │ └── topia - │ └── tutorial - │ └── library - │ ├── LibraryConfig.class - │ └── model - │ ├── AuthorAbstract.class - │ ├── Author.class - │ ├── AuthorDAOAbstract.class - │ . - │ . - │ . - └── generated-sources - ├── annotations - ├── java - │ └── org - │ └── nuiton - │ └── topia - │ └── tutorial - │ └── library - │ └── model - │ ├── AuthorAbstract.java - │ ├── AuthorDAOAbstract.java - │ ├── AuthorDAOImpl.java - │ ├── AuthorDAO.java - │ ├── AuthorImpl.hbm.xml - │ ├── Author.java - │ ├── BookAbstract.java - │ ├── BookDAOAbstract.java - │ ├── BookDAOImpl.java - │ ├── BookDAO.java - │ ├── BookImpl.hbm.xml - │ ├── BookImpl.java - │ ├── Book.java - │ └── LibraryDAOHelper.java - ├── models - │ ├── library.objectmodel - │ └── library.properties - └── xmi - ├── library.properties - └── library.xmi - - - -On peut voir que ToPIA a généré ``LibraryDAOHelper`` qui va nous permettre de -récupérer les différents DAO et, pour chaque entité de notre modèle : - * Une interface - * Une classe abstraite, qui implémente déjà tout le contrat - * Une implantation (vide, seulement les constructeurs) - * Un DAO abstrait - * Une implantation du DAO - * Un fichier de mapping hibernate (*.hbm.xml) - -Comme il s'agit d'une phase de compilation, maven va ajouter tout le code généré aux -classpath le code généré sera compilé et lié en même temps que le reste de votre application. -Tous les fichiers .class se retrouveront dans target/classes, dans la suite du processus, on -ne distingue plus le code généré du code utilisateur. - -Par la suite, si vous changez le modèle, tout sera re-généré. À chaque ``clean`` -via maven, tout ce qui a été généré est effacé. Vous pouvez donc re-généré autant -de fois que nécessaire. Attention, Maven ne détecte pas le changement du modèle -si le fichier .zargo a été modifié : il faut donc faire un clean à chaque fois -afin de forcer le re-génération du modèle dans sa dernière version. Copied: trunk/topia-persistence/src/site/rst/user/start.rst.vm (from rev 2546, trunk/topia-persistence/src/site/rst/user/start.rst) =================================================================== --- trunk/topia-persistence/src/site/rst/user/start.rst.vm (rev 0) +++ trunk/topia-persistence/src/site/rst/user/start.rst.vm 2012-05-28 10:44:08 UTC (rev 2547) @@ -0,0 +1,246 @@ +.. - +.. * #%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% +.. - +================================ +Démarrer un projet ToPIA - Maven +================================ + +Comment démarrer un projet à partir de rien. + +Créer le projet +=============== + +Pour commencer, il faut créer un projet maven en respectant les conventions +habituelles. Partons d'un projet maven vide : + +:: + + mvn archetype:generate -DgroupId=com.masociete -DartifactId=monapplication -DarchetypeArtifactId=maven-archetype-archetype + +Ajoutez un dossier ``src/main/xmi``, c'est ici que nous allons placer le modèle. + +:: + + topia-tutorial + ├── pom.xml + └── src + ├── main + │ ├── java + │ │ └── org + │ │ └── nuiton + │ │ └── topia + │ │ └── tutorial + │ │ └── library + │ ├── resources + │ │ ├── library-config.properties + │ │ └── log4j.properties + │ └── xmi + │ ├── library.properties + │ └── library.zargo + └── test + ├── java + └── resources + +Dans le pom, on ajoute ToPIA en dépendance, et on configure la génération : + +:: + + <properties> + <topiaVersion>${project.version}</topiaVersion> + <eugeneVersion>${eugenePluginVersion}</eugeneVersion> + </properties> + + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + + + <plugins> + +  + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-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.model</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + +Créer le modèle +=============== + +Utiliser ArgoUML pour décrire le modèle +--------------------------------------- + +Avec ArgoUML, créez un nouveau modèle et enregistrez-le dans ``xmi``. Nous +allons créer un modèle simplifié pour une application de gestion de +bibliothèque. + +Nous avons modélisé les entités ``Book`` et ``Author`` avec les champs +appropriés. Faites attention à bien placer les entités dans le bon package, sinon +elles ne seront pas générées. Pour que ToPIA sache que ces classes décrivent +des entités qui ont vocation à être sauvées en base, il faut leur ajouter le +stéréotype ``entity``. + +N'oubliez pas de donner un nom et une version au modèle. + +Les données associées aux éléments du modèle +-------------------------------------------- + +Le modeleur n'est pas suffisant pour décrire toute les subtilités du modèle. +Le modèle se voulant indépendant de la plate-forme cible, on ne peut y inclure +directement des notions spécifiques à ToPIA. C'est pourquoi nous allons pouvoir +ajouter ces informations spécifiques via le fichier ``library-config.properties``. + + +C'est prêt ! +============ + +Il suffit de construire l'application avec maven. + +:: + + mvn compile + + +La compilation va provoquer la phase de génération. Si on examine le contenu +de notre dossier target : + +:: + + topia-tutorial + ├── pom.xml + ├── src + │ ├── main + │ │ ├── java + │ │ │ └── org + │ │ │ └── nuiton + │ │ │ └── topia + │ │ │ └── tutorial + │ │ │ └── library + │ │ ├── resources + │ │ │ ├── library-config.properties + │ │ │ └── log4j.properties + │ │ └── xmi + │ │ ├── library.properties + │ │ └── library.zargo + │ └── test + │ ├── java + │ └── resources + └── target + ├── classes + │ ├── library-config.properties + │ ├── log4j.properties + │ └── org + │ └── nuiton + │ └── topia + │ └── tutorial + │ └── library + │ ├── LibraryConfig.class + │ └── model + │ ├── AuthorAbstract.class + │ ├── Author.class + │ ├── AuthorDAOAbstract.class + │ . + │ . + │ . + └── generated-sources + ├── annotations + ├── java + │ └── org + │ └── nuiton + │ └── topia + │ └── tutorial + │ └── library + │ └── model + │ ├── AuthorAbstract.java + │ ├── AuthorDAOAbstract.java + │ ├── AuthorDAOImpl.java + │ ├── AuthorDAO.java + │ ├── AuthorImpl.hbm.xml + │ ├── Author.java + │ ├── BookAbstract.java + │ ├── BookDAOAbstract.java + │ ├── BookDAOImpl.java + │ ├── BookDAO.java + │ ├── BookImpl.hbm.xml + │ ├── BookImpl.java + │ ├── Book.java + │ └── LibraryDAOHelper.java + ├── models + │ ├── library.objectmodel + │ └── library.properties + └── xmi + ├── library.properties + └── library.xmi + + + +On peut voir que ToPIA a généré ``LibraryDAOHelper`` qui va nous permettre de +récupérer les différents DAO et, pour chaque entité de notre modèle : + * Une interface + * Une classe abstraite, qui implémente déjà tout le contrat + * Une implantation (vide, seulement les constructeurs) + * Un DAO abstrait + * Une implantation du DAO + * Un fichier de mapping hibernate (*.hbm.xml) + +Comme il s'agit d'une phase de compilation, maven va ajouter tout le code généré aux +classpath le code généré sera compilé et lié en même temps que le reste de votre application. +Tous les fichiers .class se retrouveront dans target/classes, dans la suite du processus, on +ne distingue plus le code généré du code utilisateur. + +Par la suite, si vous changez le modèle, tout sera re-généré. À chaque ``clean`` +via maven, tout ce qui a été généré est effacé. Vous pouvez donc re-généré autant +de fois que nécessaire. Attention, Maven ne détecte pas le changement du modèle +si le fichier .zargo a été modifié : il faut donc faire un clean à chaque fois +afin de forcer le re-génération du modèle dans sa dernière version. Property changes on: trunk/topia-persistence/src/site/rst/user/start.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-persistence-tck/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -87,7 +87,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>generate-objectmodel</id> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-service-history/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -92,7 +92,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-service-security/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -132,7 +132,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>generate-sources</id> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-soa/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -119,7 +119,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <id>generate-test</id> Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2012-05-28 09:24:04 UTC (rev 2546) +++ trunk/topia-tutorial/pom.xml 2012-05-28 10:44:08 UTC (rev 2547) @@ -108,7 +108,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs>

1 0

r2546 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-tck/src/main/xmi
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 11:24:04 +0200 (Mon, 28 May 2012) New Revision: 2546 Url: http://nuiton.org/repositories/revision/topia/2546 Log: improve natural id generation (using getter) + push tag values in model Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-28 09:22:35 UTC (rev 2545) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-28 09:24:04 UTC (rev 2546) @@ -393,7 +393,9 @@ private void generateEmbeddedAttribute(Writer output, ObjectModelClass input) throws IOException { Map<String, String> xmlAttributes = Maps.newTreeMap(); - addAttribute(xmlAttributes, ATTRIBUTE_NAME, EntityTransformer.NATURAL_ID_FIELD_NAME); + String name = Introspector.decapitalize( + TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input)); + addAttribute(xmlAttributes, ATTRIBUTE_NAME, name); addAttribute(xmlAttributes, ATTRIBUTE_ACCESS, AccessType.FIELD); /*{<%=flushTag(TAG_EMBEDDED, true, xmlAttributes)%> }*/ 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 2012-05-28 09:22:35 UTC (rev 2545) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-05-28 09:24:04 UTC (rev 2546) @@ -46,6 +46,8 @@ import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.TopiaEntityContextable; +import java.beans.Introspector; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -85,9 +87,6 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); - public static final String NATURAL_ID_FIELD_NAME = "naturalId"; - - protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; @@ -108,16 +107,29 @@ protected boolean generateBooleanGetMethods; + protected String naturalIdClassName; + + protected String naturalIdFieldName; + + protected String naturalIdGetterName; + // la liste des attributs faisant parti de la clef metier - protected List<ObjectModelAttribute> naturalAttributes = new ArrayList<ObjectModelAttribute>(); + protected final List<ObjectModelAttribute> naturalAttributes = + new ArrayList<ObjectModelAttribute>(); // la liste des autres attributs - protected List<ObjectModelAttribute> noneNaturalAttributes = new ArrayList<ObjectModelAttribute>(); + protected final List<ObjectModelAttribute> noneNaturalAttributes = + new ArrayList<ObjectModelAttribute>(); + protected void clean() { outputInterface = null; outputAbstract = null; outputImpl = null; outputNaturalIdEmbedded = null; + naturalAttributes.clear(); + noneNaturalAttributes.clear(); + generateInterface = generateAbstract = + generateImpl = generateBooleanGetMethods = associationClass = false; } @Override @@ -134,10 +146,6 @@ log.debug("Will use classLoader " + getClassLoader()); } - naturalAttributes = new ArrayList<ObjectModelAttribute>(); - - noneNaturalAttributes = new ArrayList<ObjectModelAttribute>(); - // fix once for all the constant prefix to use String prefix = getConstantPrefix(input, ""); if (StringUtils.isEmpty(prefix)) { @@ -163,10 +171,13 @@ } } + naturalIdClassName = + TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input); + generateInterface = isGenerateInterface(input); generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - generateNaturalIdEmbedded= isGenerateNaturalIdEmbedded(input); + generateNaturalIdEmbedded = isGenerateNaturalIdEmbedded(input); String noGenerateBooleanGetMethods = TopiaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); @@ -188,6 +199,11 @@ if (generateNaturalIdEmbedded) { + naturalIdFieldName = Introspector.decapitalize(naturalIdClassName); + + naturalIdGetterName = getJavaBeanMethodName("get", + naturalIdFieldName); + // Create Entity Natural Id class and its header createEntityNaturalIdEmbeddedClass(input); } @@ -245,29 +261,15 @@ generateSerialVersionUID(input, outputImpl); } + if (generateNaturalIdEmbedded) { + generateSerialVersionUID(outputNaturalIdEmbedded, + outputNaturalIdEmbedded); + } - // Clean data output after transformation clean(); } - protected void generateSerialVersionUID(ObjectModelClass input, - ObjectModelClass ouput) { - - // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue(TopiaGeneratorUtil.SERIAL_VERSION_UID, - input, - model - ); - if (svUID == null) { - - // use a default one - svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; - } - addConstant(ouput, TopiaGeneratorUtil.SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); - } - protected void createEntityInterface(ObjectModelClass input) { outputInterface = createInterface(input.getName(), @@ -352,46 +354,14 @@ addContextableMethods(input, outputAbstract); } - protected void createNaturalIdField(ObjectModelClass input) { + protected void createEntityNaturalIdEmbeddedClass(ObjectModelClass input) { - String fieldName = NATURAL_ID_FIELD_NAME; + outputNaturalIdEmbedded = createClass( + TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input), + input.getPackageName()); - // add a naturalId field - String naturalIdClassName = getNaturalIdClassName(input); + addInterface(outputNaturalIdEmbedded, Serializable.class); - addAttribute(outputAbstract, - fieldName, naturalIdClassName, "new " + naturalIdClassName + "()", - //ObjectModelModifier.toValue(attrVisibility), - ObjectModelModifier.PROTECTED - ); - - // add a getter - - // Interface operation - ObjectModelOperation interfaceOperation = - addOperation(outputInterface, getJavaBeanMethodName("get", fieldName), - naturalIdClassName, ObjectModelModifier.PUBLIC); - - // Implementation - ObjectModelOperation implOperation = - createImplOperation(interfaceOperation); - - String attrType = - TopiaGeneratorUtil.getSimpleName(naturalIdClassName); - - setOperationBody(implOperation, "" -/*{ - <%=attrType%> result = this.<%=fieldName%>; - return result; - }*/ - ); - } - - protected void createEntityNaturalIdEmbeddedClass(ObjectModelClass input) { - - outputNaturalIdEmbedded = createClass(getNaturalIdClassName(input), - input.getPackageName()); - // Documentation StringBuilder doc = new StringBuilder(); doc.append("Classe représentant la clef naturel de l'entité {@link "); @@ -401,44 +371,21 @@ setDocumentation(outputNaturalIdEmbedded, doc.toString()); } - protected String getNaturalIdClassName(ObjectModelClass input) { - return TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input); - } + protected void generateSerialVersionUID(ObjectModelClass input, + ObjectModelClass ouput) { - /** - * 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) { + // serialVersionUID + String svUID = TopiaGeneratorUtil.findTagValue(TopiaGeneratorUtil.SERIAL_VERSION_UID, + input, + model + ); + if (svUID == null) { - if (TopiaGeneratorUtil.isContextable(input)) { - - addImport(outputAbstract, TopiaContextImplementor.class); - - ObjectModelOperation op = addOperation(outputAbstract, "update", "void", - ObjectModelModifier.PUBLIC); - addException(op, TopiaException.class); -// setDocumentation(op,"@since 2.5.3"); - addAnnotation(outputAbstract, op, Override.class.getSimpleName()); - setOperationBody(op, "" -/*{ - ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).update(this); -}*/ - ); - - op = addOperation(outputAbstract, "delete", "void", ObjectModelModifier.PUBLIC); - addException(op, TopiaException.class); -// setDocumentation(op,"@since 2.5.3"); - addAnnotation(outputAbstract, op, Override.class.getSimpleName()); - setOperationBody(op, "" -/*{ - ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).delete(this); -}*/ - ); + // use a default one + svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; } + addConstant(ouput, TopiaGeneratorUtil.SERIAL_VERSION_UID, long.class, svUID, + ObjectModelModifier.PRIVATE); } protected boolean isGenerateInterface(ObjectModelClass input) { @@ -456,8 +403,7 @@ protected boolean isGenerateNaturalIdEmbedded(ObjectModelClass input) { - String fqn = getNaturalIdClassName(input); - boolean alreadyInClassPath = isInClassPath(fqn); + boolean alreadyInClassPath = isInClassPath(naturalIdClassName); if (alreadyInClassPath) { return false; @@ -497,6 +443,72 @@ return true; } + protected void createNaturalIdField(ObjectModelClass input) { + + // add a naturalId field + + ObjectModelAttribute attribute = addAttribute( + outputAbstract, + naturalIdFieldName, naturalIdClassName, "new " + naturalIdClassName + "()", + ObjectModelModifier.PROTECTED,ObjectModelModifier.FINAL + ); + setDocumentation(attribute, "Clef métier de l'entité."); + + // add a getter + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, naturalIdGetterName, + naturalIdClassName, ObjectModelModifier.PUBLIC); + + // Implementation + ObjectModelOperation implOperation = + createImplOperation(interfaceOperation); + + setOperationBody(implOperation, "" +/*{ + <%=naturalIdClassName%> result = this.<%=naturalIdFieldName%>; + return result; + }*/ + ); + } + + /** + * 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) { + + if (TopiaGeneratorUtil.isContextable(input)) { + + addImport(outputAbstract, TopiaContextImplementor.class); + + ObjectModelOperation op = addOperation(outputAbstract, "update", "void", + ObjectModelModifier.PUBLIC); + addException(op, TopiaException.class); +// setDocumentation(op,"@since 2.5.3"); + addAnnotation(outputAbstract, op, Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).update(this); +}*/ + ); + + op = addOperation(outputAbstract, "delete", "void", ObjectModelModifier.PUBLIC); + addException(op, TopiaException.class); +// setDocumentation(op,"@since 2.5.3"); + addAnnotation(outputAbstract, op, Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).delete(this); +}*/ + ); + } + } + protected void generateImpl(ObjectModelClass input) { String implName = input.getName() + "Impl"; @@ -639,7 +651,6 @@ ObjectModelAttribute property = addAttribute(isNaturalId ? outputNaturalIdEmbedded : outputAbstract, attrName, attrType, null, - //ObjectModelModifier.toValue(attrVisibility), ObjectModelModifier.PROTECTED ); @@ -799,6 +810,20 @@ fireOnPostWrite(<%=constantName%>, oldValue, <%=attrName%>); }*/ ); + + if (isNaturalId(attribute)) { + + // add also a setter in the natural id class + implOperation = + cloneOperationSignature(interfaceOperation, outputNaturalIdEmbedded, false, + ObjectModelModifier.PUBLIC ); + + setOperationBody(implOperation, "" +/*{ + this.<%=attrName%> = <%=attrName%>; + }*/ + ); + } } /** @@ -1012,7 +1037,7 @@ protected String getReceiverName(ObjectModelAttribute attribute, String attrName) { String receiverName; if (isNaturalId(attribute)) { - receiverName = NATURAL_ID_FIELD_NAME + "." + attrName; + receiverName = naturalIdGetterName + "()." + attrName; } else { receiverName = "this." + attrName; } Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties =================================================================== --- trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-28 09:22:35 UTC (rev 2545) +++ trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-28 09:24:04 UTC (rev 2546) @@ -24,7 +24,3 @@ ### model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.constantPrefix=PROPERTY_ - -org.nuiton.topia.tck.mapping.test12.A12A.attribute.integerField.tagValue.notNull=true -org.nuiton.topia.tck.mapping.test12.A12A.attribute.dateField.tagValue.notNull=true -org.nuiton.topia.tck.mapping.test12.A12A.attribute.stringField.tagValue.notNull=true Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)

1 0

r2545 - trunk
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 11:22:35 +0200 (Mon, 28 May 2012) New Revision: 2545 Url: http://nuiton.org/repositories/revision/topia/2545 Log: updates h2 version + add info reporting Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 09:20:17 UTC (rev 2544) +++ trunk/pom.xml 2012-05-28 09:22:35 UTC (rev 2545) @@ -76,7 +76,7 @@  <hibernateVersion>4.1.3.Final</hibernateVersion> <sl4jVersion>1.6.4</sl4jVersion> - <h2Version>1.3.166</h2Version> + <h2Version>1.3.167</h2Version> <mockitoVersion>1.9.0</mockitoVersion> <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion> @@ -437,6 +437,46 @@ <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> +  <profile> <id>tutorial</id>

1 0

r2544 - in trunk: src/site topia-persistence/src/site topia-service-migration/src/site topia-service-replication/src/site topia-service-security/src/site
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 11:20:17 +0200 (Mon, 28 May 2012) New Revision: 2544 Url: http://nuiton.org/repositories/revision/topia/2544 Log: fix scmwebeditor links Modified: trunk/src/site/site_fr.xml trunk/topia-persistence/src/site/site_fr.xml trunk/topia-service-migration/src/site/site_fr.xml trunk/topia-service-replication/src/site/site_fr.xml trunk/topia-service-security/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-28 07:55:50 UTC (rev 2543) +++ trunk/src/site/site_fr.xml 2012-05-28 09:20:17 UTC (rev 2544) @@ -101,7 +101,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2012-05-28 07:55:50 UTC (rev 2543) +++ trunk/topia-persistence/src/site/site_fr.xml 2012-05-28 09:20:17 UTC (rev 2544) @@ -93,7 +93,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-migration/src/site/site_fr.xml =================================================================== --- trunk/topia-service-migration/src/site/site_fr.xml 2012-05-28 07:55:50 UTC (rev 2543) +++ trunk/topia-service-migration/src/site/site_fr.xml 2012-05-28 09:20:17 UTC (rev 2544) @@ -65,7 +65,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-replication/src/site/site_fr.xml =================================================================== --- trunk/topia-service-replication/src/site/site_fr.xml 2012-05-28 07:55:50 UTC (rev 2543) +++ trunk/topia-service-replication/src/site/site_fr.xml 2012-05-28 09:20:17 UTC (rev 2544) @@ -62,7 +62,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-security/src/site/site_fr.xml =================================================================== --- trunk/topia-service-security/src/site/site_fr.xml 2012-05-28 07:55:50 UTC (rev 2543) +++ trunk/topia-service-security/src/site/site_fr.xml 2012-05-28 09:20:17 UTC (rev 2544) @@ -69,7 +69,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r2543 - trunk
by maven-release＠users.nuiton.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 09:55:50 +0200 (Mon, 28 May 2012) New Revision: 2543 Url: http://nuiton.org/repositories/revision/topia/2543 Log: updates to mavenpom 3.3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-27 09:39:36 UTC (rev 2542) +++ trunk/pom.xml 2012-05-28 07:55:50 UTC (rev 2543) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>3.3.2</version> </parent> <artifactId>topia</artifactId>

1 0

r2542 - in trunk/topia-persistence-tck/src/main: java/org/nuiton/topia/tck/it xmi
by tchemit＠users.nuiton.org May 27, 2012

May 27, 2012

Author: tchemit Date: 2012-05-27 11:39:36 +0200 (Sun, 27 May 2012) New Revision: 2542 Url: http://nuiton.org/repositories/revision/topia/2542 Log: update test model + remove no more used hardocred natural id class Removed: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo Deleted: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-27 09:39:01 UTC (rev 2541) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-27 09:39:36 UTC (rev 2542) @@ -1,32 +0,0 @@ -package org.nuiton.topia.tck.it; - -/** - * Class that contains the natural ids of NaturalizedEntity. - * TODO AThimel 22/05/2012 This has to be generated ? To discuss - * TODO AThimel 22/05/2012 Find a better name - * - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public class naturalId { - - protected Integer naturalIdNotNull; - - protected String naturalIdNull; - - public Integer getNaturalIdNotNull() { - return naturalIdNotNull; - } - - public void setNaturalIdNotNull(Integer naturalIdNotNull) { - this.naturalIdNotNull = naturalIdNotNull; - } - - public String getNaturalIdNull() { - return naturalIdNull; - } - - public void setNaturalIdNull(String naturalIdNull) { - this.naturalIdNull = naturalIdNull; - } - -} Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)

1 0

r2541 - in trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck: it/persistence mapping mapping/test12 mapping/test13
by tchemit＠users.nuiton.org May 27, 2012

May 27, 2012

Author: tchemit Date: 2012-05-27 11:39:01 +0200 (Sun, 27 May 2012) New Revision: 2541 Url: http://nuiton.org/repositories/revision/topia/2541 Log: refs #2089: Use JPA (orm) mappings (deal with natural Id) (add tests) Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-27 09:38:28 UTC (rev 2540) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -31,12 +31,12 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.tck.it.TopiaDatabaseIt; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.NaturalizedEntity; import org.nuiton.topia.tck.it.NaturalizedEntityDAO; +import org.nuiton.topia.tck.it.TopiaDatabaseIt; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import javax.persistence.PersistenceException; @@ -79,7 +79,7 @@ transaction.commitTransaction(); } - @Test + @Test(expected = TopiaException.class) public void testCreateFailed() throws Exception { log.debug("Test naturalId : create failed"); TopiaContext transaction = db.beginTransaction(); @@ -87,16 +87,9 @@ NaturalizedEntityDAO dao = TopiaTckItDAOHelper.getNaturalizedEntityDAO(transaction); - // Exception will be throw -// try { - dao.create(); - transaction.commitTransaction(); - - // Note : this is possible to create an empty entity if the type - // is primitive like 'int' which have a default value of '0' -// } catch (PropertyValueException eee) { -// Assert.assertEquals("naturalIdNotNull", eee.getPropertyName()); -// } + // Exception will be throw (not null not respected) + dao.create(); + transaction.commitTransaction(); } @Test Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-27 09:38:28 UTC (rev 2540) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -35,7 +35,7 @@ Assert.assertEquals(0, nbA); // a with all fields to null - A12A a = aDAO.create(); + aDAO.create(); tx.commitTransaction(); } Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -0,0 +1,84 @@ +package org.nuiton.topia.tck.mapping.test13; + +import junit.framework.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.Date; + +/** + * Tests a entity with a {@code natural id}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class EntityWithNaturalIdTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A13ADAO aDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A13A.class); + } + + @Test(expected = TopiaException.class) + public void createwithNull() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + aDAO.create(); + tx.commitTransaction(); + } + + @Test + public void create() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + Date date = new Date(); + A13A a = aDAO.create( + A13A.PROPERTY_NATURAL_ID_STRING, "string", + A13A.PROPERTY_NATURAL_ID_INTEGER, 1, + A13A.PROPERTY_NATURAL_ID_DATE, date + ); + a.setIntegerField(10); + + tx.commitTransaction(); + + nbA = aDAO.count(); + Assert.assertEquals(1, nbA); + + A13A aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + + aBis = aDAO.findByNaturalId(1, "string", date); + Assert.assertEquals(a, aBis); + + aDAO.create( + A13A.PROPERTY_NATURAL_ID_STRING, "string", + A13A.PROPERTY_NATURAL_ID_INTEGER, 1, + A13A.PROPERTY_NATURAL_ID_DATE, date + ); + + try { + tx.commitTransaction(); + // duplicated natural id + Assert.fail(); + } catch (TopiaException e) { + Assert.assertTrue(true); + } + + } +} \ No newline at end of file

1 0