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

r2231 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: echatellier Date: 2011-03-17 15:13:57 +0100 (Thu, 17 Mar 2011) New Revision: 2231 Url: http://nuiton.org/repositories/revision/topia/2231 Log: Add if (log.isInfoEnabled()) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 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 2011-03-17 14:06:40 UTC (rev 2230) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-17 14:13:57 UTC (rev 2231) @@ -177,9 +177,11 @@ PersistentClass classMapping = configuration.getClassMapping(entityName); if (classMapping == null) { - Iterator<?> itr = configuration.getClassMappings(); - while (itr.hasNext()) { - log.info("available mapping " + itr.next()); + 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);

1 0

r2230 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 15:06:40 +0100 (Thu, 17 Mar 2011) New Revision: 2230 Url: http://nuiton.org/repositories/revision/topia/2230 Log: improve migration code (use a unique db connection for dbempty code) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 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 2011-03-17 13:33:29 UTC (rev 2229) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-17 14:06:40 UTC (rev 2230) @@ -222,4 +222,72 @@ 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; + } } 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 2011-03-17 13:33:29 UTC (rev 2229) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 14:06:40 UTC (rev 2230) @@ -46,7 +46,6 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.VersionUtil.VersionComparator; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -92,7 +91,7 @@ /** * A flag to know if none of the dealed entities tables exists in db. - * + * * @since 2.5.3 */ protected boolean dbEmpty; @@ -312,11 +311,11 @@ } if (dbEmpty) { - + // db is empty (no table, no migration to apply) return true; } - + if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { log.info(_("topia.migration.skip.migration.db.is.up.to.date")); @@ -605,42 +604,19 @@ */ protected boolean detectDbEmpty() { - boolean result = true; - + try { + boolean result; // get db real hibernate configuration Configuration rootConfiguration = rootContext.getHibernateConfiguration(); - // get all dealed classes - List<Class<?>> persistenceClasses = - new ArrayList<Class<?>>(rootContext.getPersistenceClasses()); - - // remove the tmsversion class - persistenceClasses.remove(TMSVersion.class); - - for (Class<?> persistenceClass : persistenceClasses) { - - boolean tableExist = - TopiaUtil.isSchemaExist(rootConfiguration, - persistenceClass.getName() - ); - if (tableExist) { - - // at least one table exists - result = false; - - if (log.isDebugEnabled()) { - log.debug("Detected table for " + persistenceClass); - } - break; - } - } + result = TopiaUtil.isSchemaEmpty(rootConfiguration); + return result; } catch (TopiaNotFoundException e) { throw new RuntimeException(e); } - return result; } protected Version getVersion(boolean versionTableExist, String tableName) {

1 0

r2229 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 14:33:29 +0100 (Thu, 17 Mar 2011) New Revision: 2229 Url: http://nuiton.org/repositories/revision/topia/2229 Log: use static import for I18n Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-03-17 13:32:57 UTC (rev 2228) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-03-17 13:33:29 UTC (rev 2229) @@ -55,7 +55,6 @@ import org.hibernate.event.PreUpdateEventListener; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; -import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -245,15 +244,15 @@ TopiaService service = (TopiaService) newInstance; if (key.equals("topia.service." + service.getServiceName())) { result.put(service.getServiceName(), service); - log.info(I18n._("topia.persistence.service.loaded", + log.info(_("topia.persistence.service.loaded", key, classService)); } else { - log.warn(I18n._("topia.persistence.warn.service.not.loaded", + log.warn(_("topia.persistence.warn.service.not.loaded", key, service.getServiceName())); } } catch (Throwable eee) { String message = - I18n._("topia.persistence.error.service.unknown", + _("topia.persistence.error.service.unknown", key, classService); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -269,7 +268,7 @@ protected void preInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.preInit(this)) { - log.warn(I18n._("topia.persistence.warn.service.not.preInit", + log.warn(_("topia.persistence.warn.service.not.preInit", service.getServiceName())); } } @@ -278,7 +277,7 @@ protected void postInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.postInit(this)) { - log.warn(I18n._("topia.persistence.warn.service.not.postInit", + log.warn(_("topia.persistence.warn.service.not.postInit", service.getServiceName())); } } @@ -343,13 +342,13 @@ result = (E) getService(name); } catch (Exception eee) { throw new TopiaNotFoundException( - I18n._("topia.persistence.error.service.not.retreaved", + _("topia.persistence.error.service.not.retreaved", interfaceService, getProperExceptionMessage(eee)), eee); } if (result == null) { throw new TopiaNotFoundException( - I18n._("topia.persistence.error.service.not.found", + _("topia.persistence.error.service.not.found", interfaceService)); } return result; @@ -363,7 +362,7 @@ String name = getServiceName(interfaceService); result = serviceEnabled(name); } catch (Exception eee) { - String message = I18n._("topia.persistence.warn.service.not.found", + String message = _("topia.persistence.warn.service.not.found", interfaceService, getProperExceptionMessage(eee)); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -464,7 +463,7 @@ getFiresSupport().firePostCreateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.create.schema", + _("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -476,7 +475,7 @@ execute(true, false, false, true); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.create.schema", + _("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -494,7 +493,7 @@ getFiresSupport().firePostUpdateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.update.schema", + _("topia.persistence.error.update.schema", eee.getMessage()), eee); } } @@ -503,7 +502,7 @@ public Session getHibernate() throws TopiaException { if (hibernate == null) { throw new TopiaException( - I18n._("topia.persistence.error.no.hibernate.session")); + _("topia.persistence.error.no.hibernate.session")); } return hibernate; } @@ -683,12 +682,12 @@ throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( - I18n._("topia.persistence.error.null.param", + _("topia.persistence.error.null.param", "entityClass", "getDAO")); } if (this == getRootContext()) { throw new TopiaException( - I18n._("topia.persistence.error.rootContext.access")); + _("topia.persistence.error.rootContext.access")); } if (getHibernateFactory().getClassMetadata(entityClass) == null && getHibernateFactory().getClassMetadata( @@ -696,10 +695,10 @@ getHibernateFactory().getClassMetadata( entityClass.getName() + "Abstract") == null) { - log.info(I18n._("topia.persistence.supported.classes.for.context", + log.info(_("topia.persistence.supported.classes.for.context", getHibernateFactory().getAllClassMetadata().keySet())); throw new TopiaException( - I18n._("topia.persistence.error.unsupported.class", + _("topia.persistence.error.unsupported.class", entityClass.getName())); } @@ -736,7 +735,7 @@ @Override public TopiaContext beginTransaction() throws TopiaException { - checkClosed(I18n._("topia.persistence.error.context.is.closed")); + checkClosed(_("topia.persistence.error.context.is.closed")); TopiaContextImpl result = new TopiaContextImpl(this); SessionFactory factory = getHibernateFactory(); @@ -770,7 +769,7 @@ } throw new TopiaException( - I18n._("topia.persistence.error.open.transaction.failed", + _("topia.persistence.error.open.transaction.failed", eee.getMessage()), eee); } @@ -786,11 +785,11 @@ @Override public void commitTransaction() throws TopiaException { if (getRootContext() == this) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.unsupported.operation.on.root.context", "commit")); } - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "commit")); @@ -818,7 +817,7 @@ // hibernate = getHibernateFactory().openSession(); // hibernate.setFlushMode(FlushMode.NEVER); } catch (Exception eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.commit", + throw new TopiaException(_("topia.persistence.error.on.commit", eee.getMessage()), eee); } } @@ -826,11 +825,11 @@ @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.unsupported.operation.on.root.context", "rollback")); } - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "rollback")); try { @@ -858,7 +857,7 @@ } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.on.rollback", + _("topia.persistence.error.on.rollback", eee.getMessage()), eee); } } @@ -866,7 +865,7 @@ @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed - checkClosed(I18n._("topia.persistence.error.context.already.closed")); + checkClosed(_("topia.persistence.error.context.already.closed")); // FD-20100421 : Ano #546 : no need to copy childContext, the // {@link #getChildContext()} provides a thread-safe copy to iterate @@ -928,7 +927,7 @@ @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "findById")); @@ -951,7 +950,7 @@ @Override public List find(String hql, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -974,7 +973,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -982,7 +981,7 @@ @Override public List<?> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -1007,7 +1006,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -1022,7 +1021,7 @@ */ @Override public int execute(String hql, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -1034,14 +1033,14 @@ int result = query.executeUpdate(); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @Override public void add(TopiaEntity e) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "add")); @@ -1053,7 +1052,7 @@ @Override public void importXML(Reader xml) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "importXML")); @@ -1067,7 +1066,7 @@ } } catch (DocumentException de) { throw new TopiaException( - I18n._("topia.persistence.error.on.loding.xml.doc", + _("topia.persistence.error.on.loding.xml.doc", de.getMessage()), de); } @@ -1080,7 +1079,7 @@ try { sessionDom4j.replicate(entity, ReplicationMode.EXCEPTION); } catch (HibernateException he) { - log.warn(I18n._("topia.persistence.error.replicate.entity", + log.warn(_("topia.persistence.error.replicate.entity", entity, he.getMessage()), he); } } @@ -1088,14 +1087,14 @@ sessionDom4j.flush(); } else { throw new TopiaException( - I18n._("topia.persistence.error.empty.doc")); + _("topia.persistence.error.empty.doc")); } } @Override public void exportXML(Writer xml, Object... entityAndcondition) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "exportXML")); @@ -1154,10 +1153,10 @@ result.close(); } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.export", + throw new TopiaException(_("topia.persistence.error.on.export", eee.getMessage()), eee); } catch (IOException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.export", + throw new TopiaException(_("topia.persistence.error.on.export", eee.getMessage()), eee); } } @@ -1165,18 +1164,18 @@ @Override public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; dstContextImpl.checkClosed( - I18n._("topia.persistence.error.unsupported.operation.on.closed.context", + _("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); if (getRootContext().equals(dstContextImpl.getRootContext())) { throw new IllegalArgumentException( - I18n._("topia.persistence.error.replicate.on.same.context")); + _("topia.persistence.error.replicate.on.same.context")); } String[] queries = buildQueries(entityAndCondition); @@ -1194,7 +1193,7 @@ } } } catch (HibernateException eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.replicate", eee.getMessage()), eee); } @@ -1204,17 +1203,17 @@ public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(I18n._( + dstContextImpl.checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(I18n._( + throw new IllegalArgumentException(_( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entity); @@ -1224,17 +1223,17 @@ public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(I18n._( + dstContextImpl.checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(I18n._( + throw new IllegalArgumentException(_( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entities.toArray()); @@ -1256,7 +1255,7 @@ */ @Override public void backup(File file, boolean compress) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "backup")); try { @@ -1270,7 +1269,7 @@ query.list(); } catch (Exception eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.backup", eee.getMessage()), eee); } @@ -1287,7 +1286,7 @@ public void restore(File file) throws TopiaException { // send event getFiresSupport().firePreRestoreSchema(this); - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "restore")); @@ -1320,7 +1319,7 @@ // send event AFTER restore getFiresSupport().firePostRestoreSchema(this); } catch (Exception eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.restore", sql, eee.getMessage()), eee); } @@ -1346,7 +1345,7 @@ tx.closeContext(); root.finalize(); } catch (Throwable eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.clear", eee.getMessage()), eee); } } @@ -1359,7 +1358,7 @@ @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); boolean result = TopiaUtil.isSchemaExist(hibernateConfiguration, @@ -1475,7 +1474,7 @@ /** * Build the list of queries from the given parameter - * <code>entityAndCondition>/code>. + * <code>entityAndCondition</code>. * <p/> * If no parameter is given, then build the queries for all entities is db, * with no condition. @@ -1554,7 +1553,7 @@ } } catch (HibernateException eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.replicate", eee.getMessage()), eee); }

1 0

r2228 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 14:32:57 +0100 (Thu, 17 Mar 2011) New Revision: 2228 Url: http://nuiton.org/repositories/revision/topia/2228 Log: try to solve Anomalie #1399: Database migration must not run if database schema doesn't exists improve migration engine class Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 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 2011-03-17 09:59:22 UTC (rev 2227) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 13:32:57 UTC (rev 2228) @@ -31,6 +31,7 @@ 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; @@ -45,6 +46,7 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.VersionUtil.VersionComparator; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -88,6 +90,13 @@ /** Drapeau pour savoir si la base est versionnée ou non */ protected boolean dbNotVersioned; + /** + * A flag to know if none of the dealed entities tables exists in db. + * + * @since 2.5.3 + */ + protected boolean dbEmpty; + /** Un drapeau pour effectuer la migration au demarrage (initialise en pre-init) */ protected boolean migrateOnInit; @@ -198,17 +207,17 @@ log.debug("Use callback - " + callbackStr); } - migrateOnInit = Boolean.valueOf(config.getProperty(MIGRATION_MIGRATE_ON_INIT, "true")); + migrateOnInit = Boolean.valueOf(config.getProperty(MIGRATION_MIGRATE_ON_INIT, String.valueOf(Boolean.TRUE))); if (log.isDebugEnabled()) { log.debug("Migrate on init - " + migrateOnInit); } - showSql = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_SQL, "false")); + showSql = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_SQL, String.valueOf(Boolean.FALSE))); if (log.isDebugEnabled()) { log.debug("Show sql - " + showSql); } - showProgression = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_PROGRESSION, "false")); + showProgression = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_PROGRESSION, String.valueOf(Boolean.FALSE))); if (log.isDebugEnabled()) { log.debug("Show progression - " + showProgression); } @@ -228,7 +237,7 @@ configuration.addClass(aClass); } - versionConfiguration = creaHibernateConfiguration(configuration); + versionConfiguration = createHibernateConfiguration(configuration); init = true; @@ -290,16 +299,28 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", version.getVersion(), dbVersion.getVersion())); + log.info(_("topia.migration.start.migration", + version.getVersion(), + dbVersion.getVersion()) + ); if (log.isDebugEnabled()) { log.debug("Migrate schema to version = " + dbVersion); log.debug("is db not versionned ? = " + dbNotVersioned); + log.debug("is db empty ? = " + dbEmpty); log.debug("TMSVersion exists = " + versionTableExist); } + if (dbEmpty) { + + // db is empty (no table, no migration to apply) + return true; + } + if (versionTableExist && dbVersion.equals(version)) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + } // la base est a jour return true; } @@ -317,7 +338,9 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + } // la base est a jour mais il faut migrer la table saveApplicationVersion(); return true; @@ -326,7 +349,9 @@ SortedSet<Version> allVersions = new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); - log.info(_("topia.migration.available.versions", allVersions)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.available.versions", allVersions)); + } // tell if migration is needed boolean needToMigrate = false; @@ -343,9 +368,13 @@ ); if (versionsToApply.isEmpty()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.no.version.to.apply")); + } } else { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.migrate.versions", versionsToApply)); + } // perform the migration needToMigrate = callback.doMigration(rootContext, @@ -399,7 +428,7 @@ if (log.isDebugEnabled()) { log.debug("Save version = " + version); - log.debug("table exists = " + versionTableExist); + log.debug("Table exists = " + versionTableExist); log.debug("Detected version = " + dbVersion); } @@ -431,7 +460,9 @@ // delete all previous data in table TMSVersionDAO.deleteAll(tx); - log.info(_("topia.migration.saving.db.version", version)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.saving.db.version", version)); + } // create new version and store it in table TMSVersion tmsVersion = @@ -475,8 +506,9 @@ * Recupere depuis la base les états internes du service : * <p/> * <ul> - * <li>versionTableExist</li> - * <li>dbVersion</li> + * <li>{@link #versionTableExist}</li> + * <li>{@link #dbVersion}</li> + * <li>{@link #dbEmpty}</li> * </ul> */ protected void detectDbVersion() { @@ -490,6 +522,14 @@ return; } + // compute dbempty field value + dbEmpty = detectDbEmpty(); + + if (log.isDebugEnabled()) { + log.debug("Db is empty : " + dbEmpty); + } + + Version v = null; try { @@ -498,6 +538,9 @@ TopiaUtil.isSchemaExist(versionConfiguration, TMSVersion.class.getName()); + // check if at least one class exists in db + + if (log.isDebugEnabled()) { log.debug("Table " + TMSVersionDAO.TABLE_NAME + " exist = " + versionTableExist); } @@ -513,7 +556,7 @@ Configuration conf = new Configuration(); conf.addXML(TMSVersionDAO.LEGACY_MAPPING); - legacyVersionConfiguration = creaHibernateConfiguration(conf); + legacyVersionConfiguration = createHibernateConfiguration(conf); legacyVersionTableExist = TopiaUtil.isSchemaExist(legacyVersionConfiguration, TMSVersion.class.getName()); @@ -552,6 +595,54 @@ } } + /** + * Detects if there is some schema existing for at least one of the dealed + * entity of the underlying db context. + * + * @return {@code true} if there is no schema for any of the dealed entities, + * {@code false} otherwise. + * @since 2.5.3 + */ + protected boolean detectDbEmpty() { + + boolean result = true; + + try { + // get db real hibernate configuration + Configuration rootConfiguration = + rootContext.getHibernateConfiguration(); + + // get all dealed classes + List<Class<?>> persistenceClasses = + new ArrayList<Class<?>>(rootContext.getPersistenceClasses()); + + // remove the tmsversion class + persistenceClasses.remove(TMSVersion.class); + + for (Class<?> persistenceClass : persistenceClasses) { + + boolean tableExist = + TopiaUtil.isSchemaExist(rootConfiguration, + persistenceClass.getName() + ); + if (tableExist) { + + // at least one table exists + result = false; + + if (log.isDebugEnabled()) { + log.debug("Detected table for " + persistenceClass); + } + break; + } + } + } catch (TopiaNotFoundException e) { + throw new RuntimeException(e); + } + + return result; + } + protected Version getVersion(boolean versionTableExist, String tableName) { if (!versionTableExist) { @@ -587,7 +678,26 @@ } } + /** + * Creates the hibernate configuration to be used by the service. + * + * @param configuration the incoming hibernate configuration + * @return the complete configuration usable by the service + * @deprecated since 2.5.3, prefer to use the method {@link #createHibernateConfiguration(Configuration)} + */ + @Deprecated protected Configuration creaHibernateConfiguration(Configuration configuration) { + return createHibernateConfiguration(configuration); + } + + /** + * Creates the hibernate configuration to be used by the service. + * + * @param configuration the incoming hibernate configuration + * @return the complete configuration usable by the service + * @since 2.5.3 + */ + protected Configuration createHibernateConfiguration(Configuration configuration) { Properties config = rootContext.getConfig(); Properties prop = new Properties();

1 0

r2227 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 10:59:22 +0100 (Thu, 17 Mar 2011) New Revision: 2227 Url: http://nuiton.org/repositories/revision/topia/2227 Log: improve TopiaentityMap Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2011-03-17 09:56:17 UTC (rev 2226) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2011-03-17 09:59:22 UTC (rev 2227) @@ -63,8 +63,13 @@ * @param e the entity on which to find the key. * @return the key of the given entity. */ - protected abstract K getType(TopiaEntity e); + protected abstract K getType(Class<?> e); + public <T extends V> List<T> get(Class<T> type) { + K key = getType(type); + List<T> vs = (List<T>) get(key); + return vs; + } /** * Adds the given entity to the dictonary only if it does not exists. @@ -97,7 +102,7 @@ @SuppressWarnings({"unchecked"}) protected <T extends V> List<T> getList(T entity) { - K type = getType(entity); + K type = getType(entity.getClass()); List<T> list = (List<T>) get(type); if (list == null) { list = new ArrayList<T>();

1 0

r2226 - trunk
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 10:56:17 +0100 (Thu, 17 Mar 2011) New Revision: 2226 Url: http://nuiton.org/repositories/revision/topia/2226 Log: use license-m-p Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-14 13:38:12 UTC (rev 2225) +++ trunk/pom.xml 2011-03-17 09:56:17 UTC (rev 2226) @@ -317,8 +317,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <configuration> <extraExtensions> <objectmodel>xml</objectmodel>

1 0

r2225 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence
by echatellier＠users.nuiton.org 14 Mar '11

14 Mar '11

Author: echatellier Date: 2011-03-14 14:38:12 +0100 (Mon, 14 Mar 2011) New Revision: 2225 Url: http://nuiton.org/repositories/revision/topia/2225 Log: Add delete operation on entity Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-14 09:31:25 UTC (rev 2224) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-14 13:38:12 UTC (rev 2225) @@ -289,6 +289,16 @@ ((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); +}*/ + ); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-14 09:31:25 UTC (rev 2224) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-14 13:38:12 UTC (rev 2225) @@ -61,4 +61,11 @@ * @throws TopiaException */ public void update() throws TopiaException; + + /** + * Delete entity in persistence context. + * + * @throws TopiaException + */ + public void delete() throws TopiaException; }

1 0

r2224 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org 14 Mar '11

14 Mar '11

Author: echatellier Date: 2011-03-14 10:31:25 +0100 (Mon, 14 Mar 2011) New Revision: 2224 Url: http://nuiton.org/repositories/revision/topia/2224 Log: This should not have been committed Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-12 14:21:55 UTC (rev 2223) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-14 09:31:25 UTC (rev 2224) @@ -56,7 +56,7 @@ protected Date topiaCreateDate = new Date(); - //transient protected TopiaContext topiaContext; + transient protected TopiaContext topiaContext; transient protected VetoableChangeSupport readVetoables; @@ -144,21 +144,21 @@ this.topiaCreateDate = topiaCreateDate; } - /*public TopiaContext getTopiaContext() { + public TopiaContext getTopiaContext() { return topiaContext; - }*/ + } - /* + /** * @param context The context to set. * @throws TopiaException if any pb ? - * + */ public void setTopiaContext(TopiaContext context) throws TopiaException { if (topiaContext == null) { topiaContext = context; } else { throw new TopiaException("Remplacement du contexte interdit"); } - }*/ + } @Override public List<TopiaEntity> getComposite() throws TopiaException {

1 0

r2223 - trunk
by tchemit＠users.nuiton.org 12 Mar '11

12 Mar '11

Author: tchemit Date: 2011-03-12 15:21:55 +0100 (Sat, 12 Mar 2011) New Revision: 2223 Url: http://nuiton.org/repositories/revision/topia/2223 Log: Update mavenpom4redmineAndCentral to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-11 17:29:42 UTC (rev 2222) +++ trunk/pom.xml 2011-03-12 14:21:55 UTC (rev 2223) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <artifactId>topia</artifactId>

1 0

r2222 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework generator persistence
by echatellier＠users.nuiton.org 11 Mar '11

11 Mar '11

Author: echatellier Date: 2011-03-11 18:29:42 +0100 (Fri, 11 Mar 2011) New Revision: 2222 Url: http://nuiton.org/repositories/revision/topia/2222 Log: #1391 : TopiaContext doit pouvoir ?\195?\170tre accessible depuis l'entit?\195?\169 Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -23,17 +23,6 @@ * #L% */ -/* * - * TopiaContextImplementor.java - * - * Created: 3 janv. 2006 21:27:24 - * - * @author poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ package org.nuiton.topia.framework; import org.hibernate.Session; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -33,8 +33,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.ArrayList; -import java.util.List; /** * Filter Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -24,6 +24,14 @@ */ package org.nuiton.topia.generator; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.logging.Log; @@ -44,18 +52,11 @@ import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; +import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; - - /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -204,7 +205,12 @@ // Extends TopiaEntity (only if hasn't parent entity) if (needTopiaEntity) { - addInterface(outputInterface, TopiaEntity.class); + if (TopiaGeneratorUtil.isContextable(input)) { + addInterface(outputInterface, TopiaEntityContextable.class); + } + else { + addInterface(outputInterface, TopiaEntity.class); + } } } @@ -259,8 +265,34 @@ addConstant(outputInterface, "serialVersionUID", long.class, svUID, ObjectModelModifier.PRIVATE); } + + addContextableMethods(input, outputAbstract); } + /** + * Ajout les methodes necessaire à l'interface {@link TopiaEntityContextable} + * si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} est renseigné. + */ + 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); +}*/ + ); + } + + } + protected boolean isGenerateImpl(ObjectModelClass input, Collection<ObjectModelOperation> operations) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -67,7 +67,6 @@ * @author tchemit <tchemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> * @author chatellier <chatellier(a)codelutin.com> - * @author thimel <thimel(a)codelutin.com> * @version $Id$ */ public class TopiaGeneratorUtil extends JavaGeneratorUtil { @@ -819,6 +818,22 @@ } /** + * Retourne true si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} + * à la valeur {@code true}. + * + * @param classifier classifier to test + * @return {@code true} si {@link TopiaTagValues#TAG_CONTEXTABLE} == {@code true} + */ + public static boolean isContextable(ObjectModelClassifier classifier) { + boolean result = false; + String value = classifier.getTagValue(TopiaTagValues.TAG_CONTEXTABLE); + if (StringUtils.equalsIgnoreCase(value, "true")) { + result = true; + } + return result; + } + + /** * Obtain the list of fqn of object involed in the given class. * * @param aClass the clazz to inspect Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -32,6 +32,7 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntityEnum; import static org.nuiton.eugene.ModelPropertiesUtil.TagValueDefinition; @@ -65,6 +66,15 @@ String TAG_PERSISTENCE_TYPE = "persistenceType"; /** + * Tag pour que les entités etendent {@link TopiaEntityContextable} et + * se fasse injecter le {@link TopiaContext} par rapport aux autres + * entités qui ne l'ont pas. + * @since 2.5.3 + */ + @TagValueDefinition(target = {ObjectModelClassifier.class}, documentation = "") + String TAG_CONTEXTABLE = "contextable"; + + /** * Tag pour le nom du champ / entité en BD. * * @see TopiaGeneratorUtil#getDbNameTagValue(ObjectModelElement) @@ -362,7 +372,7 @@ * @since 2.3.2 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Sets the fully qualified name of the exeception to generate in Services and QueryHelper") + documentation = "Sets the fully qualified name of the exception to generate in Services and QueryHelper") String TAG_EXCEPTION_CLASS = "exceptionClass"; // ------------------------------------------------------------------------- Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -58,12 +58,9 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.security.Permission; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -23,22 +23,8 @@ * #L% */ -/******************************************************************************* - * TopiaEntityAbstract.java - * - * Created: 28 déc. 2005 22:50:42 - * - * @author poussin <poussin(a)codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package org.nuiton.topia.persistence; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -64,16 +50,13 @@ /** serialVersionUID. */ private static final long serialVersionUID = -7458577454878852241L; - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaEntityAbstract.class); - protected String topiaId; protected long topiaVersion; protected Date topiaCreateDate = new Date(); - transient protected TopiaContext topiaContext; + //transient protected TopiaContext topiaContext; transient protected VetoableChangeSupport readVetoables; @@ -161,21 +144,21 @@ this.topiaCreateDate = topiaCreateDate; } - public TopiaContext getTopiaContext() { + /*public TopiaContext getTopiaContext() { return topiaContext; - } + }*/ - /** + /* * @param context The context to set. * @throws TopiaException if any pb ? - */ + * public void setTopiaContext(TopiaContext context) throws TopiaException { if (topiaContext == null) { topiaContext = context; } else { throw new TopiaException("Remplacement du contexte interdit"); } - } + }*/ @Override public List<TopiaEntity> getComposite() throws TopiaException { Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -0,0 +1,64 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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% + */ + +package org.nuiton.topia.persistence; + +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * {@link TopiaEntity} with {@link TopiaContext} support (injected by + * {@link TopiaContext} into entities). + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface TopiaEntityContextable extends TopiaEntity { + + /** + * Set topia context. + * + * @param topiaContext topia context + * @throws TopiaException if current topia entity context is not null + */ + public void setTopiaContext(TopiaContext topiaContext) throws TopiaException; + + /** + * Get topia context. + * + * @return topia context + */ + public TopiaContext getTopiaContext(); + + /** + * Update entity in persistence context. + * + * @throws TopiaException + */ + public void update() throws TopiaException; +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0