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

r1056 - tags/ver-2-0-3 topia2/tags
by thimel＠users.labs.libre-entreprise.org 19 Sep '08

19 Sep '08

Author: thimel Date: 2008-09-19 14:31:21 +0000 (Fri, 19 Sep 2008) New Revision: 1056 Added: topia2/tags/2.0.3/ Removed: tags/ver-2-0-3/topia2/ Log: Moved tag 2.0.3 Copied: topia2/tags/2.0.3 (from rev 1055, tags/ver-2-0-3/topia2)

1 0

r1055 - tags/ver-2-0-2 topia2/tags
by thimel＠users.labs.libre-entreprise.org 19 Sep '08

19 Sep '08

Author: thimel Date: 2008-09-19 14:30:10 +0000 (Fri, 19 Sep 2008) New Revision: 1055 Added: topia2/tags/2.0.2/ Removed: tags/ver-2-0-2/topia2/ Log: Moved tag 2.0.2 Copied: topia2/tags/2.0.2 (from rev 1054, tags/ver-2-0-2/topia2)

1 0

r1054 - topia2
by thimel＠users.labs.libre-entreprise.org 19 Sep '08

19 Sep '08

Author: thimel Date: 2008-09-19 14:23:33 +0000 (Fri, 19 Sep 2008) New Revision: 1054 Added: topia2/branches/ topia2/tags/ Log: Added branches and tags folders

1 0

r1053 - topia2 trunk
by thimel＠users.labs.libre-entreprise.org 19 Sep '08

19 Sep '08

Author: thimel Date: 2008-09-19 14:17:01 +0000 (Fri, 19 Sep 2008) New Revision: 1053 Added: topia2/trunk/ Removed: trunk/topia2/ Log: Created topia2 trunk with correct structure Copied: topia2/trunk (from rev 1052, trunk/topia2)

1 0

r1052 - /
by thimel＠users.labs.libre-entreprise.org 19 Sep '08

19 Sep '08

Author: thimel Date: 2008-09-19 14:16:41 +0000 (Fri, 19 Sep 2008) New Revision: 1052 Added: topia2/ Log: Created topia2 root

1 0

r1051 - trunk/topia2
by bpoussin＠users.labs.libre-entreprise.org 01 Sep '08

01 Sep '08

Author: bpoussin Date: 2008-09-01 10:03:42 +0000 (Mon, 01 Sep 2008) New Revision: 1051 Modified: trunk/topia2/pom.xml Log: modif de version de dependance pour utilise des intervales Modified: trunk/topia2/pom.xml =================================================================== --- trunk/topia2/pom.xml 2008-08-29 18:59:03 UTC (rev 1050) +++ trunk/topia2/pom.xml 2008-09-01 10:03:42 UTC (rev 1051) @@ -104,16 +104,16 @@ <dependencies>  <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.29-SNAPSHOT</version> + <version>[0.29,]</version> <scope>compile</scope> </dependency> <dependency> <groupId>lutinlib</groupId> <artifactId>lutingenerator</artifactId> - <version>0.51-SNAPSHOT</version> + <version>[0.50,]</version> <scope>compile</scope> </dependency>

1 0

r1050 - trunk/topia-service/src/java/org/codelutin/topia/migration
by chatellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: chatellier Date: 2008-08-29 18:59:03 +0000 (Fri, 29 Aug 2008) New Revision: 1050 Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationService.java trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java Log: Le service s'ajoute en listener de nouvelle transaction Sur une nouvelle transaction, il se reenregistre sur le context fils Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationService.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationService.java 2008-08-29 15:26:35 UTC (rev 1049) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationService.java 2008-08-29 18:59:03 UTC (rev 1050) @@ -19,6 +19,7 @@ package org.codelutin.topia.migration; import org.codelutin.topia.event.TopiaContextListener; +import org.codelutin.topia.event.TopiaTransactionVetoable; import org.codelutin.topia.framework.TopiaService; /** @@ -32,7 +33,7 @@ * * Last update : $Date$ */ -public interface TopiaMigrationService extends TopiaService, TopiaContextListener { +public interface TopiaMigrationService extends TopiaService, TopiaContextListener, TopiaTransactionVetoable { /** * Nom du service Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-08-29 15:26:35 UTC (rev 1049) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-08-29 18:59:03 UTC (rev 1050) @@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaRuntimeException; import org.codelutin.topia.event.TopiaContextEvent; -import org.codelutin.topia.framework.TopiaContextImpl; +import org.codelutin.topia.event.TopiaTransactionEvent; import org.codelutin.topia.framework.TopiaContextImplementor; import org.codelutin.topia.migration.callback.MigrationCallbackHandler; import org.codelutin.topia.migration.common.Version; @@ -188,6 +188,7 @@ // add topia context listener context.addTopiaContextListener(this); + context.addTopiaTransactionVetoable(this); // test mappingdir null if(mappingdir == null) { @@ -283,6 +284,7 @@ * @see org.codelutin.topia.event.TopiaContextListener#postRestoreSchema(org.codelutin.topia.event.TopiaContextEvent) */ public void postRestoreSchema(TopiaContextEvent event) { + if(log.isInfoEnabled()) { log.info("postRestoreSchema event detected, redo, schema migration"); } @@ -294,4 +296,16 @@ } } } + + /* + * @see org.codelutin.topia.event.TopiaTransactionVetoable#beginTransaction(org.codelutin.topia.event.TopiaTransactionEvent) + */ + public void beginTransaction(TopiaTransactionEvent event) { + + TopiaContextImplementor context = (TopiaContextImplementor)event.getSource(); + + // add topia context listener + context.addTopiaContextListener(this); + + } }

1 0

r1049 - trunk/topia2/src/java/org/codelutin/topia/framework
by chatellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: chatellier Date: 2008-08-29 15:26:35 +0000 (Fri, 29 Aug 2008) New Revision: 1049 Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: Add missing avent after restore Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-29 15:21:22 UTC (rev 1048) +++ trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-29 15:26:35 UTC (rev 1049) @@ -1083,6 +1083,9 @@ SQLQuery query = getHibernate().createSQLQuery("RUNSCRIPT FROM '" + file.getAbsolutePath() + "'" + options); query.executeUpdate(); + // send event AFTER restore + getFiresSupport().firePostRestoreSchema(this); + // BufferedReader reader = new BufferedReader(new InputStreamReader(in)); // Connection conn = getHibernate().connection(); // conn.setAutoCommit(false);

1 0

r1048 - trunk/topia-service/src/java/org/codelutin/topia/migration
by chatellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: chatellier Date: 2008-08-29 15:21:22 +0000 (Fri, 29 Aug 2008) New Revision: 1048 Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java Log: Redo migration after Schema Restore Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-08-29 15:20:42 UTC (rev 1047) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-08-29 15:21:22 UTC (rev 1048) @@ -46,6 +46,9 @@ */ public class TopiaMigrationServiceImpl extends MigrationServiceImpl implements TopiaMigrationService { + // log + private final static Log log = LogFactory.getLog(TopiaMigrationServiceImpl.class); + /** * Nom des proprietes */ @@ -268,4 +271,27 @@ public void preUpdateSchema(TopiaContextEvent event) { } + + /* + * @see org.codelutin.topia.event.TopiaContextListener#preRestoreSchema(org.codelutin.topia.event.TopiaContextEvent) + */ + public void preRestoreSchema(TopiaContextEvent event) { + + } + + /* + * @see org.codelutin.topia.event.TopiaContextListener#postRestoreSchema(org.codelutin.topia.event.TopiaContextEvent) + */ + public void postRestoreSchema(TopiaContextEvent event) { + if(log.isInfoEnabled()) { + log.info("postRestoreSchema event detected, redo, schema migration"); + } + try { + migrateSchema(); + } catch (MigrationServiceException e) { + if(log.isErrorEnabled()) { + log.error("postRestoreSchema schema migration failed", e); + } + } + } }

1 0

r1047 - in trunk/topia2: . src/java/org/codelutin/topia/event src/java/org/codelutin/topia/framework
by chatellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: chatellier Date: 2008-08-29 15:20:42 +0000 (Fri, 29 Aug 2008) New Revision: 1047 Removed: trunk/topia2/.jupiter trunk/topia2/.umlproject Modified: trunk/topia2/src/java/org/codelutin/topia/event/TopiaContextListener.java trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java trunk/topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java Log: Add pre and post restore event on migration on TopiaContext Deleted: trunk/topia2/.jupiter =================================================================== --- trunk/topia2/.jupiter 2008-08-28 18:09:46 UTC (rev 1046) +++ trunk/topia2/.jupiter 2008-08-29 15:20:42 UTC (rev 1047) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Property> - <Review id="DEFAULT"> - <Description>property.default.description</Description> - <Author/> - <CreationDate format="yyyy-MM-dd :: HH:mm:ss:SSS z">1970-01-01 :: 00:00:00:000 GMT-10:00</CreationDate> - <Directory>review</Directory> - <Reviewers/> - <Files/> - <FieldItems> - <FieldItem id="Type" default="item.label.unset"> - <Entry name="item.label.unset" /> - <Entry name="item.type.label.codingStandards" /> - <Entry name="item.type.label.programLogic" /> - <Entry name="item.type.label.optimization" /> - <Entry name="item.type.label.usability" /> - <Entry name="item.type.label.clarity" /> - <Entry name="item.type.label.missing" /> - <Entry name="item.type.label.irrelevant" /> - <Entry name="item.type.label.suggestion" /> - <Entry name="item.type.label.other" /> - </FieldItem> - <FieldItem id="Severity" default="item.label.unset"> - <Entry name="item.label.unset" /> - <Entry name="item.severity.label.critical" /> - <Entry name="item.severity.label.major" /> - <Entry name="item.severity.label.normal" /> - <Entry name="item.severity.label.minor" /> - <Entry name="item.severity.label.trivial" /> - </FieldItem> - <FieldItem id="Resolution" default="item.label.unset"> - <Entry name="item.label.unset" /> - <Entry name="item.resolution.label.validNeedsfixing" /> - <Entry name="item.resolution.label.validFixlater" /> - <Entry name="item.resolution.label.validDuplicate" /> - <Entry name="item.resolution.label.validWontfix" /> - <Entry name="item.resolution.label.invalidWontfix" /> - <Entry name="item.resolution.label.unsureValidity" /> - </FieldItem> - <FieldItem id="Status" default="item.status.label.open"> - <Entry name="item.status.label.open" /> - <Entry name="item.status.label.resolved" /> - <Entry name="item.status.label.closed" /> - <Entry name="item.status.label.reopened" /> - </FieldItem> - </FieldItems> - <Filters> - <Phase name="phase.individual" enabled="true"> - <Filter name="Interval" value="7" enabled="false" /> - <Filter name="Reviewer" value="item.reviewer.label.automatic" enabled="true" /> - <Filter name="Type" value="item.label.unset" enabled="false" /> - <Filter name="Severity" value="item.label.unset" enabled="false" /> - <Filter name="AssignedTo" value="" enabled="false" /> - <Filter name="Resolution" value="item.label.unset" enabled="false" /> - <Filter name="Status" value="item.status.label.open" enabled="false" /> - <Filter name="File" value="" enabled="false" /> - </Phase> - <Phase name="phase.team" enabled="true"> - <Filter name="Interval" value="7" enabled="false" /> - <Filter name="Reviewer" value="" enabled="false" /> - <Filter name="Type" value="item.label.unset" enabled="false" /> - <Filter name="Severity" value="item.label.unset" enabled="false" /> - <Filter name="AssignedTo" value="" enabled="false" /> - <Filter name="Resolution" value="item.label.unset" enabled="true" /> - <Filter name="Status" value="item.status.label.open" enabled="false" /> - <Filter name="File" value="" enabled="false" /> - </Phase> - <Phase name="phase.rework" enabled="true"> - <Filter name="Interval" value="7" enabled="false" /> - <Filter name="Reviewer" value="" enabled="false" /> - <Filter name="Type" value="item.label.unset" enabled="false" /> - <Filter name="Severity" value="item.label.unset" enabled="false" /> - <Filter name="AssignedTo" value="item.reviewer.label.automatic" enabled="true" /> - <Filter name="Resolution" value="item.label.unset" enabled="false" /> - <Filter name="Status" value="item.status.label.open" enabled="true" /> - <Filter name="File" value="" enabled="false" /> - </Phase> - </Filters> - </Review> -</Property> \ No newline at end of file Deleted: trunk/topia2/.umlproject =================================================================== --- trunk/topia2/.umlproject 2008-08-28 18:09:46 UTC (rev 1046) +++ trunk/topia2/.umlproject 2008-08-29 15:20:42 UTC (rev 1047) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<properties:ProjectDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:properties="properties.xmi" modelDir="model" libraryDir="libraries" profileDir="profiles" templateDir="templates"> - <profiles id="org.eclipse.uml2.resources.BasicProfile" description="Basic Profile" uri="platform:/plugin/org.eclipse.uml2.resources/profiles/Basic.profile.uml2" exported="false" kind="system"/> - <profiles id="org.eclipse.uml2.resources.IntermediateProfile" description="Intermediate Profile" uri="platform:/plugin/org.eclipse.uml2.resources/profiles/Intermediate.profile.uml2" exported="false" kind="system"/> - <profiles id="org.eclipse.uml2.resources.CompleteProfile" description="Complete Profile" uri="platform:/plugin/org.eclipse.uml2.resources/profiles/Complete.profile.uml2" exported="false" kind="system"/> - <profiles id="com.omondo.uml.core.JavaProfile" description="Java Profile" uri="platform:/plugin/com.omondo.uml.core/profiles/Java.profile.uml2" exported="false" kind="system"/> - <profiles id="com.omondo.uml2.core.OmondoProfile" description="Omondo Profile" uri="platform:/plugin/com.omondo.uml.core/profiles/Omondo.profile.uml2" exported="false" kind="system"/> - <profiles id="com.omondo.uml2.core.ArchetypeProfile" description="Archetype Profile" uri="platform:/plugin/com.omondo.uml.core/profiles/Archetype.profile.uml2" exported="false" kind="system"/> -</properties:ProjectDescription> Modified: trunk/topia2/src/java/org/codelutin/topia/event/TopiaContextListener.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/event/TopiaContextListener.java 2008-08-28 18:09:46 UTC (rev 1046) +++ trunk/topia2/src/java/org/codelutin/topia/event/TopiaContextListener.java 2008-08-29 15:20:42 UTC (rev 1047) @@ -59,4 +59,16 @@ * @param event event */ public void postUpdateSchema(TopiaContextEvent event); + + /** + * Called after updateSchema call + * @param event event + */ + public void preRestoreSchema(TopiaContextEvent event); + + /** + * Called after updateSchema call + * @param event event + */ + public void postRestoreSchema(TopiaContextEvent event); } Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-28 18:09:46 UTC (rev 1046) +++ trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-29 15:20:42 UTC (rev 1047) @@ -1057,6 +1057,9 @@ * @see org.codelutin.topia.TopiaContext#restore(java.io.File) */ public void restore(File file) throws TopiaException { + // send event + getFiresSupport().firePreRestoreSchema(this); + checkClosed("Ce contexte a ete ferme, impossible d'effectuer le restore"); String sql = null; try { Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2008-08-28 18:09:46 UTC (rev 1046) +++ trunk/topia2/src/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2008-08-29 15:20:42 UTC (rev 1047) @@ -637,7 +637,7 @@ } /** - * Notify topia context listeners for create schema post operation + * Notify topia context listeners for create schema pre operation * @param context topia context */ public void firePreUpdateSchema(TopiaContext context) { @@ -671,6 +671,42 @@ } } } + + /** + * Notify topia context listeners for schema restore pre operation + * @param context topia context + */ + public void firePreRestoreSchema(TopiaContext context) { + if (log.isDebugEnabled()) { + log.debug("firePreRestoreSchema"); + } + TopiaContextEvent event = new TopiaContextEvent(context); + for(Iterator<TopiaContextListener> l=topiaContextListeners.iterator(); l.hasNext();) { + try { + l.next().preRestoreSchema(event); + } catch (Exception eee) { + throw new TopiaVetoException(eee); + } + } + } + + /** + * Notify topia context listeners for schema restore post operation + * @param context topia context + */ + public void firePostRestoreSchema(TopiaContext context) { + if (log.isDebugEnabled()) { + log.debug("firePostRestoreSchema"); + } + TopiaContextEvent event = new TopiaContextEvent(context); + for(Iterator<TopiaContextListener> l=topiaContextListeners.iterator(); l.hasNext();) { + try { + l.next().postRestoreSchema(event); + } catch (Exception eee) { + throw new TopiaVetoException(eee); + } + } + } /** * Notify entities listeners for load operation

1 0