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

r2008 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 13 Jun '10

13 Jun '10

Author: tchemit Date: 2010-06-13 19:30:39 +0200 (Sun, 13 Jun 2010) New Revision: 2008 Url: http://nuiton.org/repositories/revision/topia/2008 Log: isSchemaExist can be used for any type of persistent classes (not only for TopiaEntity) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.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 2010-06-13 09:43:00 UTC (rev 2007) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-06-13 17:30:39 UTC (rev 2008) @@ -1334,7 +1334,7 @@ } @Override - public boolean isSchemaExist(Class<? extends TopiaEntity> clazz) + public boolean isSchemaExist(Class<?> clazz) throws TopiaException { checkClosed(I18n._( "topia.persistence.error.unsupported.operation.on.closed.context", 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 2010-06-13 09:43:00 UTC (rev 2007) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2010-06-13 17:30:39 UTC (rev 2008) @@ -100,7 +100,7 @@ * @return Returns the hibernate. * @throws TopiaException si aucune transaction n'est ouverte */ - boolean isSchemaExist(Class<? extends TopiaEntity> clazz) throws TopiaException; + boolean isSchemaExist(Class<?> clazz) throws TopiaException; /** * Get DAO for specified class. If Specialized DAO exists then it returned

1 0

r2007 - trunk/topia-persistence/src/main/java/org/nuiton/topia/event
by tchemit＠users.nuiton.org 13 Jun '10

13 Jun '10

Author: tchemit Date: 2010-06-13 11:43:00 +0200 (Sun, 13 Jun 2010) New Revision: 2007 Url: http://nuiton.org/repositories/revision/topia/2007 Log: introduce TopiaContextAdapter Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java 2010-06-13 09:43:00 UTC (rev 2007) @@ -0,0 +1,36 @@ +package org.nuiton.topia.event; + +/** + * Adapter pattern of {@link TopiaContextListener}. + * + * This implementation does nothing but permits developpers to use this adapater + * without to have to implements all methods. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class TopiaContextAdapter implements TopiaContextListener { + @Override + public void preCreateSchema(TopiaContextEvent event) { + } + + @Override + public void postCreateSchema(TopiaContextEvent event) { + } + + @Override + public void preUpdateSchema(TopiaContextEvent event) { + } + + @Override + public void postUpdateSchema(TopiaContextEvent event) { + } + + @Override + public void preRestoreSchema(TopiaContextEvent event) { + } + + @Override + public void postRestoreSchema(TopiaContextEvent event) { + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2006 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 22:47:00 +0200 (Sat, 12 Jun 2010) New Revision: 2006 Url: http://nuiton.org/repositories/revision/topia/2006 Log: Use instanciated listeners in migration 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 2010-06-12 20:46:40 UTC (rev 2005) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2010-06-12 20:47:00 UTC (rev 2006) @@ -172,8 +172,8 @@ init = true; // add topia context listener - context.addTopiaContextListener(contextListener); - context.addTopiaTransactionVetoable(transactionVetoable); + context.addTopiaContextListener(getContextListener()); + context.addTopiaTransactionVetoable(getTransactionVetoable()); if (migrateOnInit) { try {

1 0

r2005 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 22:46:40 +0200 (Sat, 12 Jun 2010) New Revision: 2005 Url: http://nuiton.org/repositories/revision/topia/2005 Log: Evolution #683: Throw a NullPointerException when adding or removing a null listener in TopiaFireSupport Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2010-06-12 15:54:17 UTC (rev 2004) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2010-06-12 20:46:40 UTC (rev 2005) @@ -899,6 +899,9 @@ public void addTopiaEntityListener( Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } entityListeners.add(entityClass, listener); } @@ -909,26 +912,44 @@ public void addTopiaEntityVetoable( Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + if (vetoable == null) { + throw new NullPointerException("listener can not be null."); + } entityVetoables.add(entityClass, vetoable); } public void addTopiaTransactionListener(TopiaTransactionListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } transactionListeners.add(listener); } public void addTopiaTransactionVetoable(TopiaTransactionVetoable vetoable) { + if (vetoable== null) { + throw new NullPointerException("listener can not be null."); + } transactionVetoables.add(vetoable); } public void addPropertyChangeListener(PropertyChangeListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } propertyChangeListeners.add(listener); } public void addTopiaContextListener(TopiaContextListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } topiaContextListeners.add(listener); } public void addTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable) { + if (vetoable == null) { + throw new NullPointerException("listener can not be null."); + } entitiesVetoables.add(vetoable); } @@ -941,6 +962,9 @@ public void removeTopiaEntityListener( Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } entityListeners.remove(entityClass, listener); } @@ -951,26 +975,44 @@ public void removeTopiaEntityVetoable( Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + if (vetoable == null) { + throw new NullPointerException("listener can not be null."); + } entityVetoables.remove(entityClass, vetoable); } public void removeTopiaTransactionListener(TopiaTransactionListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } transactionListeners.remove(listener); } public void removeTopiaTransactionVetoable(TopiaTransactionVetoable vetoable) { + if (vetoable == null) { + throw new NullPointerException("listener can not be null."); + } transactionVetoables.remove(vetoable); } public void removePropertyChangeListener(PropertyChangeListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } propertyChangeListeners.remove(listener); } public void removeTopiaContextListener(TopiaContextListener listener) { + if (listener == null) { + throw new NullPointerException("listener can not be null."); + } topiaContextListeners.remove(listener); } public void removeTopiaEntitiesVetoable(TopiaEntitiesVetoable vetoable) { + if (vetoable == null) { + throw new NullPointerException("listener can not be null."); + } entitiesVetoables.remove(vetoable); }

1 0

r2004 - trunk
by fdesbois＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: fdesbois Date: 2010-06-12 17:54:17 +0200 (Sat, 12 Jun 2010) New Revision: 2004 Url: http://nuiton.org/repositories/revision/topia/2004 Log: Use eugene 2.0.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:25:33 UTC (rev 2003) +++ trunk/pom.xml 2010-06-12 15:54:17 UTC (rev 2004) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.2-SNAPSHOT</eugene.version> + <eugene.version>2.0.2</eugene.version> <lutinutil.version>1.3.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2003 - trunk
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:25:33 +0200 (Sat, 12 Jun 2010) New Revision: 2003 Url: http://nuiton.org/repositories/revision/topia/2003 Log: use nuiton-utils 1.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-11 10:32:51 UTC (rev 2002) +++ trunk/pom.xml 2010-06-12 14:25:33 UTC (rev 2003) @@ -231,7 +231,7 @@  <eugene.version>2.0.2-SNAPSHOT</eugene.version> - <lutinutil.version>1.3.1-SNAPSHOT</lutinutil.version> + <lutinutil.version>1.3.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version>

1 0

r2002 - in trunk/topia-service-security/src/main/java/org/nuiton/topia/taas: . jaas
by sletellier＠users.nuiton.org 11 Jun '10

11 Jun '10

Author: sletellier Date: 2010-06-11 12:32:51 +0200 (Fri, 11 Jun 2010) New Revision: 2002 Url: http://nuiton.org/repositories/revision/topia/2002 Log: Realy fork jass checkPermission method Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-06-10 23:26:35 UTC (rev 2001) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-06-11 10:32:51 UTC (rev 2002) @@ -341,10 +341,15 @@ // Code that note use realy jaas Set<TaasPrincipalWrapper> ps = subj.getPrincipals(TaasPrincipalWrapper.class); for (TaasPrincipalWrapper p : ps) { - if (!p.getPermissions().implies(myp)) { - throw new SecurityException("Access denied to object " + myp); + if (log.isDebugEnabled()) { + log.debug("Check permissions for principal wrapper : " + p); } + if (p.getPermissions().implies(myp)) { + return; + } } + throw new SecurityException("Access denied to object " + myp); + // Old code that use realy jaas //AccessController.checkPermission(myp); } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java 2010-06-10 23:26:35 UTC (rev 2001) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java 2010-06-11 10:32:51 UTC (rev 2002) @@ -51,7 +51,7 @@ import org.nuiton.topia.taas.TaasService; /** - * Implantation d'un policy avec une prise en compte des permissions � la vol�e. + * Implantation d'un policy avec une prise en compte des permissions à la volée. * @author ruchaud */ public class TaasPolicy extends Policy { @@ -118,7 +118,7 @@ } } } else { - log.error("R�cup�ration des Permissions impossible"); + log.error("Récupération des Permissions impossible"); } return pc; } catch (Throwable eee) { @@ -149,8 +149,8 @@ } /** - * Installe cette TopiaPolicy. Si la Policy existante est d�ja cette - * TopiaPolicy alors la m�thode n'a pas d'effet. Si une autre Policy existe + * Installe cette TopiaPolicy. Si la Policy existante est déja cette + * TopiaPolicy alors la méthode n'a pas d'effet. Si une autre Policy existe * deja alors cette TopiaPolicy, elle conserve l'ancienne Policy dans * parentPolicy et la remplace alors. */

1 0

r2001 - trunk/topia-service-security
by tchemit＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: tchemit Date: 2010-06-11 01:26:35 +0200 (Fri, 11 Jun 2010) New Revision: 2001 Url: http://nuiton.org/repositories/revision/topia/2001 Log: svn:ignore Modified: trunk/topia-service-security/ Property changes on: trunk/topia-service-security ___________________________________________________________________ Modified: svn:ignore - *.ipr .classpath *.iws .project *.iml .settings + *.ipr .classpath *.iws .project *.iml .settings target

1 0

r2000 - trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:44:07 +0200 (Wed, 09 Jun 2010) New Revision: 2000 Url: http://nuiton.org/repositories/revision/topia/2000 Log: add constant Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-06-09 10:17:21 UTC (rev 1999) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-06-09 10:44:07 UTC (rev 2000) @@ -62,8 +62,12 @@ */ public interface TopiaReplicationService extends TopiaService { + /** Nom du service */ String SERVICE_NAME = "replication"; + /** Nom du service topia */ + String TOPIA_SERVICE_NAME = "topia.service.replication"; + /** * Prepare le modele de replication pour les entites dans les topiaIds sont * donnes.

1 0

r1999 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:17:21 +0200 (Wed, 09 Jun 2010) New Revision: 1999 Url: http://nuiton.org/repositories/revision/topia/1999 Log: improvde desing delgate to concrete listeners in engine, TopiaMigrationSerivce has nothing to do with listeners Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.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/TopiaMigrationService.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java 2010-06-09 06:28:55 UTC (rev 1998) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java 2010-06-09 10:17:21 UTC (rev 1999) @@ -25,14 +25,26 @@ package org.nuiton.topia.migration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Configuration; +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.event.TopiaContextEvent; +import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.migration.ManualMigrationCallback.MigrationChoice; +import org.nuiton.util.Resource; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; +import org.nuiton.util.VersionUtil.VersionComparator; - import java.io.File; import java.net.URL; import java.net.URLClassLoader; @@ -43,114 +55,72 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; -import org.nuiton.util.Resource; -import org.hibernate.cfg.Configuration; -import org.hibernate.tool.hbm2ddl.SchemaExport; import static org.nuiton.i18n.I18n._; -import org.nuiton.topia.framework.TopiaContextImpl; -import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.topia.migration.ManualMigrationCallback.MigrationChoice; -import org.nuiton.util.VersionUtil; -import org.nuiton.util.VersionUtil.VersionComparator; /** * TopiaMigrationServiceImpl.java - * + * * Classe principale du projet. - * + * * @author tchemit * @deprecated since 2.4, please use now the simplify service {@link TopiaMigrationEngine} */ @Deprecated public class ManualMigrationEngine //extends MigrationServiceImpl - implements TopiaMigrationService { + implements TopiaMigrationService , TopiaContextListener, TopiaTransactionVetoable { // log + private final static Log log = LogFactory.getLog(ManualMigrationEngine.class); - /** - * La version de référence - */ + + /** La version de référence */ static public final String MIGRATION_APPLICATION_VERSION = "topia.service.migration.version"; - /** - * L'emplacement de tous les mappings - */ + + /** L'emplacement de tous les mappings */ static public final String MIGRATION_MAPPING_DIRECTORY = "topia.service.migration.mappingdir"; - /** - * Les noms des modèles connus - */ + + /** Les noms des modèles connus */ static public final String MIGRATION_MODEL_NAME = "topia.service.migration.modelname"; - /** - * L'unique handler a utiliser - */ - static public final String MIGRATION_CALLBACK = "topia.service.migration.callback"; - /** - * Un drapeau pour indiquer si on doit lancer le service au demarrage - */ - static public final String MIGRATION_MIGRATE_ON_INIT = "topia.service.migration.no.migrate.on.init"; - /** - * Pour afficher les requetes sql executees - */ - static public final String MIGRATION_SHOW_SQL = "showSql"; - /** - * Pour afficher la progression des requetes sql executees - */ - static public final String MIGRATION_SHOW_PROGRESSION = "showProgression"; - /** - * Configuration hibernate ne mappant que l'entite version (initialise en pre-init) - */ + + /** Configuration hibernate ne mappant que l'entite version (initialise en pre-init) */ protected Configuration versionConfiguration; - /** - * Chemin du dossier contenant les schemas de toutes les versions (initialise en pre-init) - */ + + /** Chemin du dossier contenant les schemas de toutes les versions (initialise en pre-init) */ protected String mappingsDirectory; - /** - * ensemble des versions connues par le service - */ + + /** ensemble des versions connues par le service */ protected SortedSet<Version> versions; - /** - * Version courante de l'application (initialise en pre-init) - */ + + /** Version courante de l'application (initialise en pre-init) */ protected Version applicationVersion; - /** - * Un drapeau pour savoir si la table version existe en base (initialise en pre-init) - */ + + /** Un drapeau pour savoir si la table version existe en base (initialise en pre-init) */ protected boolean versionTableExist; - /** - * Version courante de la base (initialise en pre-init) - */ + + /** Version courante de la base (initialise en pre-init) */ protected Version dbVersion; - /** - * Drapeau pour savoir si la base est versionnée ou non - */ + + /** Drapeau pour savoir si la base est versionnée ou non */ protected boolean dbNotVersioned; - /** - * Un drapeau pour effectuer la migration au demarrage (initialise en pre-init) - */ + + /** Un drapeau pour effectuer la migration au demarrage (initialise en pre-init) */ protected boolean migrateOnInit; - /** - * CallbackHandler list (initialise en pre-init) - */ + + /** CallbackHandler list (initialise en pre-init) */ protected ManualMigrationCallback callback; - /** - * topia root context (initialise en pre-init) - */ + + /** topia root context (initialise en pre-init) */ protected TopiaContextImplementor rootContext; - /** - * Un drapeau pour savoir si le service a bien ete initialise (i.e a bien fini la methode preInit) - */ - protected boolean init = false; - /** - * Un drapeau pour afficher les requetes sql executees - */ - protected boolean showSql = false; - /** - * Un drapeau pour afficher la progression des requetes sql executees - */ - protected boolean showProgression= false; + /** Un drapeau pour savoir si le service a bien ete initialise (i.e a bien fini la methode preInit) */ + protected boolean init; + + /** Un drapeau pour afficher les requetes sql executees */ + protected boolean showSql; + + /** Un drapeau pour afficher la progression des requetes sql executees */ + protected boolean showProgression; + @Override public Class<?>[] getPersistenceClasses() { return new Class<?>[]{TMSVersionImpl.class}; @@ -158,7 +128,7 @@ @Override public String getServiceName() { - return TopiaMigrationService.SERVICE_NAME; + return SERVICE_NAME; } @Override @@ -349,8 +319,8 @@ if (log.isDebugEnabled()) { log.debug("Migrate schema start version = " + dbVersion + - " _ not versioned = " + dbNotVersioned + - " _ TMSVersion exists = " + versionTableExist); + " _ not versioned = " + dbNotVersioned + + " _ TMSVersion exists = " + versionTableExist); } if (versionTableExist && dbVersion.equals(applicationVersion)) { @@ -384,11 +354,11 @@ log.info(_("topia.migration.migrate.versions", versionsToApply)); // ask handler for migration MigrationChoice bMigrationWanted = callback.doMigration(rootContext, - dbVersion, - applicationVersion, - showSql, - showProgression, - versionsToApply); + dbVersion, + applicationVersion, + showSql, + showProgression, + versionsToApply); if (log.isDebugEnabled()) { log.debug("Handler choose : " + bMigrationWanted); @@ -428,7 +398,7 @@ if (log.isDebugEnabled()) { log.debug("Save version = " + version + - " _ table exists = " + versionTableExist); + " _ table exists = " + versionTableExist); } if (dbVersion == null) { @@ -502,7 +472,7 @@ * Recupere toutes les versions prises en charge par le service de migration. * * @return l'ensemble triee (par ordre croissant) de toutes les versions - * detectees a partir du repertoire des mappings pour le modele donne. + * detectees a partir du repertoire des mappings pour le modele donne. * @throws MigrationServiceException pour tout probleme */ protected SortedSet<Version> getVersions() throws MigrationServiceException { @@ -544,12 +514,11 @@ /** * Recupere depuis la base les états internes du service : - * + * * <ul> * <li>versionTableExist</li> * <li>dbVersion</li> * </ul> - * */ protected synchronized void detectDbVersion() { 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 2010-06-09 06:28:55 UTC (rev 1998) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2010-06-09 10:17:21 UTC (rev 1999) @@ -34,7 +34,9 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextEvent; +import org.nuiton.topia.event.TopiaContextListener; 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.util.Version; @@ -53,9 +55,9 @@ * Le moteur de migration proposé par topia. Il est basé sur un {@link TopiaMigrationCallback} * qui donne la version de l'application, les version de mises à jour disponibles. * - * Le call back offre aussi les commandes sql à passer poru chaque version de mise à jour. + * Le call back offre aussi les commandes sql à passer pour chaque version de mise à jour. * - * TODO Finir cette documentation + * FIXME Finir cette documentation * * @author tchemit * @version $Id$ @@ -66,18 +68,6 @@ /** logger */ private final static Log log = LogFactory.getLog(TopiaMigrationEngine.class); - /** L'unique handler a utiliser */ - static public final String MIGRATION_CALLBACK = "topia.service.migration.callback"; - - /** Un drapeau pour indiquer si on doit lancer le service au demarrage */ - static public final String MIGRATION_MIGRATE_ON_INIT = "topia.service.migration.no.migrate.on.init"; - - /** Pour afficher les requetes sql executees */ - static public final String MIGRATION_SHOW_SQL = "topia.service.migration.showSql"; - - /** Pour afficher la progression des requetes sql executees */ - static public final String MIGRATION_SHOW_PROGRESSION = "topia.service.migration.showProgression"; - /** Configuration hibernate ne mappant que l'entite version (initialise en pre-init) */ protected Configuration versionConfiguration; @@ -108,6 +98,16 @@ /** Un drapeau pour afficher la progression des requetes sql executees */ protected boolean showProgression; + /** delegate context listener. */ + protected TopiaContextListener contextListener; + + /** delgate transaction listener */ + protected TopiaTransactionVetoable transactionVetoable; + + //-------------------------------------------------------------------------- + //-- TopiaService implementation + //-------------------------------------------------------------------------- + @Override public Class<?>[] getPersistenceClasses() { return new Class<?>[]{TMSVersionImpl.class}; @@ -118,14 +118,6 @@ return SERVICE_NAME; } - protected String getSafeParameter(Properties config, String key) { - String value = config.getProperty(key, null); - if (StringUtils.isEmpty(value)) { - throw new IllegalStateException("'" + key + "' not set."); - } - return value; - } - @Override public boolean preInit(TopiaContextImplementor context) { rootContext = context; @@ -180,12 +172,15 @@ init = true; // add topia context listener - context.addTopiaContextListener(this); - context.addTopiaTransactionVetoable(this); + context.addTopiaContextListener(contextListener); + context.addTopiaTransactionVetoable(transactionVetoable); if (migrateOnInit) { try { + if (log.isDebugEnabled()) { + log.debug("Starts Migrate from preInit..."); + } doMigrateSchema(); } catch (MigrationServiceException e) { @@ -205,62 +200,6 @@ return true; } - @Override - public void preCreateSchema(TopiaContextEvent event) { - } - - @Override - public void preRestoreSchema(TopiaContextEvent event) { - } - - @Override - public void preUpdateSchema(TopiaContextEvent event) { - } - - @Override - public void postCreateSchema(TopiaContextEvent event) { - - if (log.isDebugEnabled()) { - log.debug("postCreateSchema event called : put version in database"); - } - - saveApplicationVersion(); - } - - @Override - public void postUpdateSchema(TopiaContextEvent event) { - if (log.isDebugEnabled()) { - log.debug("postUpdateSchema event called : put version in database"); - } - - saveApplicationVersion(); - } - - @Override - public void postRestoreSchema(TopiaContextEvent event) { - if (log.isDebugEnabled()) { - log.debug("postRestoreSchema event detected, redo, schema migration"); - } - try { - - doMigrateSchema(); - - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("postRestoreSchema schema migration failed for reason " + e.getMessage(), e); - } - } - } - - @Override - public void beginTransaction(TopiaTransactionEvent event) { - - TopiaContextImplementor context = (TopiaContextImplementor) event.getSource(); - - // add topia context listener - context.addTopiaContextListener(this); - } - public void doMigrateSchema() throws MigrationServiceException { // migration boolean complete = migrateSchema(); @@ -449,6 +388,78 @@ dbVersion = version; } + + protected TopiaContextListener getContextListener() { + if (contextListener == null) { + contextListener = new TopiaContextListener() { + @Override + public void preCreateSchema(TopiaContextEvent event) { + } + + @Override + public void postCreateSchema(TopiaContextEvent event) { + if (log.isDebugEnabled()) { + log.debug("postCreateSchema event called : will save version in database"); + } + + saveApplicationVersion(); + } + + @Override + public void preUpdateSchema(TopiaContextEvent event) { + + } + + @Override + public void postUpdateSchema(TopiaContextEvent event) { + if (log.isDebugEnabled()) { + log.debug("postUpdateSchema event called : will save version in database"); + } + + saveApplicationVersion(); + } + + @Override + public void preRestoreSchema(TopiaContextEvent event) { + } + + @Override + public void postRestoreSchema(TopiaContextEvent event) { + if (log.isDebugEnabled()) { + log.debug("postRestoreSchema event detected, redo, schema migration"); + } + try { + + doMigrateSchema(); + + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("postRestoreSchema schema migration failed for reason " + e.getMessage(), e); + } + } + } + }; + } + return contextListener; + } + + protected TopiaTransactionVetoable getTransactionVetoable() { + if (transactionVetoable == null) { + transactionVetoable = new TopiaTransactionVetoable() { + @Override + public void beginTransaction(TopiaTransactionEvent event) { + + TopiaContextImplementor context = (TopiaContextImplementor) event.getSource(); + + // add topia context listener + context.addTopiaContextListener(contextListener); + + } + }; + } + return transactionVetoable; + } + /** * Recupere depuis la base les états internes du service : * @@ -501,6 +512,14 @@ dbVersion = v; } + protected String getSafeParameter(Properties config, String key) { + String value = config.getProperty(key, null); + if (StringUtils.isEmpty(value)) { + throw new IllegalStateException("'" + key + "' not set."); + } + return value; + } + protected void checkInit() { if (!init) { throw new IllegalStateException("le service n'est pas initialisé!"); Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2010-06-09 06:28:55 UTC (rev 1998) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2010-06-09 10:17:21 UTC (rev 1999) @@ -25,8 +25,6 @@ package org.nuiton.topia.migration; -import org.nuiton.topia.event.TopiaContextListener; -import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaService; /** @@ -36,16 +34,28 @@ * @author Chevallereau Benjamin * @author Eon Sébastien * @author Trève Vincent - * @version $Revision$ - * - * Last update : $Date$ + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ */ -public interface TopiaMigrationService extends TopiaService, TopiaContextListener, TopiaTransactionVetoable { +public interface TopiaMigrationService extends TopiaService{ //}, TopiaContextListener, TopiaTransactionVetoable { - /** - * Nom du service - */ + /** Nom du service */ String SERVICE_NAME = "migration"; + /** Nom du service topia */ + String TOPIA_SERVICE_NAME = "topia.service.migration"; + + /** Pour spécifier dans la configuration le callback a utiliser */ + String MIGRATION_CALLBACK = "topia.service.migration.callback"; + + /** Un drapeau pour indiquer si on doit lancer le service au demarrage */ + String MIGRATION_MIGRATE_ON_INIT = "topia.service.migration.no.migrate.on.init"; + + /** Pour afficher les requetes sql executees */ + String MIGRATION_SHOW_SQL = "topia.service.migration.showSql"; + + /** Pour afficher la progression des requetes sql executees */ + String MIGRATION_SHOW_PROGRESSION = "topia.service.migration.showProgression"; + boolean migrateSchema() throws MigrationServiceException; } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java 2010-06-09 06:28:55 UTC (rev 1998) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationServiceImpl.java 2010-06-09 10:17:21 UTC (rev 1999) @@ -32,7 +32,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextEvent; +import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.callback.MigrationCallbackHandler; import org.nuiton.util.Version; @@ -50,7 +52,7 @@ * @deprecated since 2.4, please use now the simplify service {@link TopiaMigrationEngine} */ @Deprecated -public class TopiaMigrationServiceImpl extends MigrationServiceImpl implements TopiaMigrationService { +public class TopiaMigrationServiceImpl extends MigrationServiceImpl implements TopiaMigrationService, TopiaContextListener, TopiaTransactionVetoable { // log private final static Log log = LogFactory.getLog(TopiaMigrationServiceImpl.class);

1 0