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

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

Aug. 29, 2008

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 Aug. 29, 2008

Aug. 29, 2008

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 Aug. 29, 2008

Aug. 29, 2008

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 Aug. 29, 2008

Aug. 29, 2008

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

r1046 - trunk/topia-service/src/java/org/codelutin/topia/taas/jaas
by ruchaud＠users.labs.libre-entreprise.org Aug. 28, 2008

Aug. 28, 2008

Author: ruchaud Date: 2008-08-28 18:09:46 +0000 (Thu, 28 Aug 2008) New Revision: 1046 Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java Log: Modification du log des exceptions Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-26 21:34:43 UTC (rev 1045) +++ trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-28 18:09:46 UTC (rev 1046) @@ -37,7 +37,6 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; -import java.util.Properties; import java.util.Set; import javax.security.auth.Subject; @@ -51,11 +50,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; import org.codelutin.topia.TopiaServiceDAOHelper; -import org.codelutin.topia.framework.TopiaContextImpl; -import org.codelutin.topia.framework.TopiaUtil; import org.codelutin.topia.taas.TaasService; import org.codelutin.topia.taas.TaasUtil; import org.codelutin.topia.taas.entities.TaasPrincipal; @@ -164,13 +159,10 @@ transaction.commitTransaction(); transaction.closeContext(); - } catch (TopiaException te) { - // Echec de récupération de l'utilisateur - if (log.isWarnEnabled()) { - log.warn("Erreur lors de l'authentification", te); - } + } catch (Exception e) { LoginException le = new LoginException("Erreur lors de l'authentification"); - le.initCause(te); + le.initCause(e); + log.error(e); throw le; }

1 0

r1045 - trunk/topia2
by tchemit＠users.labs.libre-entreprise.org Aug. 26, 2008

Aug. 26, 2008

Author: tchemit Date: 2008-08-26 21:34:43 +0000 (Tue, 26 Aug 2008) New Revision: 1045 Modified: trunk/topia2/pom.xml Log: pour le moment, je ne suis pas convaincu de processer les fichiers java vers un repertoire que maven inclut dans le cp ? dans les ide, on se retrouve alors des duplicated classes. Ma question : doit-on processer topia ? Modified: trunk/topia2/pom.xml =================================================================== --- trunk/topia2/pom.xml 2008-08-26 21:24:13 UTC (rev 1044) +++ trunk/topia2/pom.xml 2008-08-26 21:34:43 UTC (rev 1045) @@ -42,7 +42,7 @@ <properties>  - <maven.src.dir>${basedir}/target/generated-sources</maven.src.dir> + <maven.src.dir>${basedir}/target/gen</maven.src.dir>  <maven.test.skip>true</maven.test.skip>

1 0

r1044 - in trunk/topia2: . src/java/org/codelutin/topia src/java/org/codelutin/topia/framework
by tchemit＠users.labs.libre-entreprise.org Aug. 26, 2008

Aug. 26, 2008

Author: tchemit Date: 2008-08-26 21:24:13 +0000 (Tue, 26 Aug 2008) New Revision: 1044 Modified: trunk/topia2/changelog trunk/topia2/src/java/org/codelutin/topia/TopiaContext.java trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: ajout d'une methode find pour extraire uniquement une fenetre d'entite Modified: trunk/topia2/changelog =================================================================== --- trunk/topia2/changelog 2008-08-26 08:35:26 UTC (rev 1043) +++ trunk/topia2/changelog 2008-08-26 21:24:13 UTC (rev 1044) @@ -1,6 +1,6 @@ ver-2-0-26 ?? ??? - - * 20082907 [cheemit] Suppression des dependances en dur sur les implantations d'entites + * 20082608 [chemit] permettre de recuperer uniquement une fenetre de resultat en hql (TopiaContext#find(String hql,int startIndex,int endIndex, Object ... args) + * 20082907 [chemit] Suppression des dependances en dur sur les implantations d'entites * 20072012 [thimel] Support des index sur les attibuts * 20072012 [ruchaud] Récupération des classes persistées * 20072012 [ruchaud] Création d'un vetoable sur les finds Modified: trunk/topia2/src/java/org/codelutin/topia/TopiaContext.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/TopiaContext.java 2008-08-26 08:35:26 UTC (rev 1043) +++ trunk/topia2/src/java/org/codelutin/topia/TopiaContext.java 2008-08-26 21:24:13 UTC (rev 1044) @@ -94,13 +94,13 @@ /** * Permet de créer le schema de la base de données - * @throws TopiaException + * @throws TopiaException if any exception */ public void createSchema() throws TopiaException; /** * Permet de mettre à jour le schema de la base de données - * @throws TopiaException + * @throws TopiaException if any exception */ public void updateSchema() throws TopiaException; @@ -108,20 +108,22 @@ /** * applique les modifications apporté a ce context sur la base de données. + * @throws TopiaException if any exception */ public void commitTransaction() throws TopiaException; /** * annule les modifications apporté a ce context + * @throws TopiaException if any exception */ public void rollbackTransaction() throws TopiaException; /** * Permet de rechercher un entite directement par son TopiaId * - * @param topiaId - * @return - * @throws TopiaException + * @param topiaId l'id de l'entite recherche + * @return l'entite trouvee (ou null si non trouve) + * @throws TopiaException if any exception */ public TopiaEntity findByTopiaId(String topiaId) throws TopiaException; @@ -133,21 +135,34 @@ * @throws TopiaException si une erreur survient durant la requete */ public List find(String hql, Object ... args) throws TopiaException; - + /** + * Permet de faire une requete HQL hibernate directement sur la base + * en precisant la fenetre des elements a remonter avec les parametres <code>startIndex</code> + * et <code>endIndex</code>. + * @param hql la requete a faire + * @param startIndex la position du premier element a remonter + * @param endIndex la position du dernier element a remonter + * @param args les arguments de la requete + * @return La liste des resultats + * @throws TopiaException si une erreur survient durant la requete + */ + public List find(String hql,int startIndex,int endIndex, Object ... args) throws TopiaException; + + /** * Execute HQL operation on data (Update, Delete) * @param hql la requete a faire * @param args les arguments de la requete * @return The number of entities updated or deleted. - * @throws TopiaException + * @throws TopiaException if any exception */ public int execute(String hql, Object ... args) throws TopiaException; /** * Permet d'ajouter dans le TopiaContext une TopiaEntity créé par un * autre context. - * @param e - * @throws TopiaException + * @param e l'entity a ajouter + * @throws TopiaException if any exception */ public void add(TopiaEntity e) throws TopiaException; @@ -178,7 +193,7 @@ * @param file le nom du fichier ou stocker les informations * @param compress si vrai compress le fichier avec gzip * - * @throws TopiaException + * @throws TopiaException if any exception */ public void backup(File file, boolean compress) throws TopiaException; @@ -188,27 +203,29 @@ * @param dropDatabase si vrai alors supprime aussi la base de données * si la base utilise des fichiers les fichiers seront supprimé (ex: h2) * ou sera fait sur la base (pastgresql) - * @throws TopiaException + * @throws TopiaException if any exception */ public void clear(boolean dropDatabase) throws TopiaException; /** - * l'inverse de la methode {@link #backup(File)} + * l'inverse de la methode {@link #backup(File,boolean)} * * @param file le fichier ou prendre les informations, il peut-etre * compressé avec gzip ou non. * - * @throws TopiaException + * @throws TopiaException if any exception */ public void restore(File file) throws TopiaException; /** * Ferme le contexte + * @throws TopiaException if any exception */ public void closeContext() throws TopiaException; /** * Indique si le contexte a ete ferme + * @return <code>true</code> si le context est ferme, <code>false</code> autrement */ public boolean isClosed(); Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-26 08:35:26 UTC (rev 1043) +++ trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-26 21:24:13 UTC (rev 1044) @@ -315,7 +315,6 @@ /** * Constructeur utilisé par le beginTransaction pour créer le context fils. * - * @param config la configuration du * @param parentContext * @throws HibernateException * @throws TopiaNotFoundException @@ -798,8 +797,8 @@ */ public TopiaEntity findByTopiaId(String topiaId) throws TopiaException { checkClosed("Ce contexte a ete ferme, impossible de faire une recherche"); - TopiaEntity result = null; - Class entityClass = TopiaId.getClassName(topiaId); + TopiaEntity result; + Class<?extends TopiaEntity> entityClass = TopiaId.getClassName(topiaId); TopiaDAO dao = getDAO(entityClass); result = dao.findByTopiaId(topiaId); return result; @@ -829,6 +828,30 @@ throw new TopiaException("Error during query execution: " + hql, eee); } } + + public List find(String hql,int startIndex,int endIndex, Object ... args) throws TopiaException { + checkClosed("Ce contexte a ete ferme, impossible de faire une recherche"); + try { + Query query = getHibernate().createQuery(hql); + for (int j = 0; j < args.length; j += 2) { + String name = (String)args[j]; + Object value = args[j + 1]; + if(value.getClass().isArray()) { + query.setParameterList(name, (Object[])value); + } else { + query.setParameter(name, value); + } + } + query.setFirstResult(startIndex); + query.setMaxResults(endIndex-startIndex+1); + List result = query.list(); + result = firesSupport.fireEntitiesLoad(this, result); + return result; + } catch (HibernateException eee) { + throw new TopiaException("Error during query execution: " + hql, eee); + } + } + /** * Execute HQL operation on data (Update, Delete) @@ -867,7 +890,7 @@ */ public void importXML(Reader xml) throws TopiaException { checkClosed("Ce contexte a ete ferme, impossible d'effectuer l'import"); - Document doc = null; + Document doc; SAXReader xmlReader = new SAXReader(); try { @@ -902,8 +925,8 @@ public void exportXML(Writer xml, Object... entityAndcondition) throws TopiaException { checkClosed("Ce contexte a ete ferme, impossible d'effectuer l'export"); try { - Class entityClass = null; - String condition = null; + Class entityClass; + String condition; // si entityAndcondition est vide alors il faut le remplir // avec toutes les entités du mapping (class, null) @@ -977,7 +1000,7 @@ * @param file file to write backup * @param compress if true then use gzip to compress file * - * @see org.codelutin.topia.TopiaContext#backup(java.io.File) + * @see TopiaContext#backup(java.io.File,boolean) */ public void backup(File file, boolean compress) throws TopiaException { checkClosed("Ce contexte a ete ferme, impossible d'effectuer le backup");

1 0

r1043 - trunk/topia2/src/java/org/codelutin/topia/generator
by eore＠users.labs.libre-entreprise.org Aug. 26, 2008

Aug. 26, 2008

Author: eore Date: 2008-08-26 08:35:26 +0000 (Tue, 26 Aug 2008) New Revision: 1043 Modified: trunk/topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java Log: correction des DTO Modified: trunk/topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java 2008-08-22 16:24:45 UTC (rev 1042) +++ trunk/topia2/src/java/org/codelutin/topia/generator/DTOGenerator.java 2008-08-26 08:35:26 UTC (rev 1043) @@ -51,9 +51,7 @@ import org.codelutin.generator.models.object.ObjectModelInterface; /** - * Generateur d'entites abstraites. Il s'agit de l'implatation par defaut d'une - * entite. Les classes generees sont surchargees par un XXXImpl lorsque l'entite - * n'est pas abstraite. La surcharge peut etre ecrite par l'utilisateur. + * DTO generator */ public class DTOGenerator extends ObjectModelGenerator { @@ -95,7 +93,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; /** - * Implantation DTO pour <%=Util.capitalize(clazz.getName())%>. + * DTO implantation for <%=Util.capitalize(clazz.getName())%> entity. *) public class <%=clazz.getName()%>DTO }*/ @@ -208,14 +206,14 @@ }*/ /*{ /** - * Constructeur de <%=clazz.getName()%>DTO par défaut. + * Default constructor of <%=clazz.getName()%>DTO. *) public <%=clazz.getName()%>DTO() {} }*/ /*{ /** - * Constructeur de <%=clazz.getName()%>DTO avec tous ses paramètres. + * Constructor of <%=clazz.getName()%>DTO with all parameters. *) public <%=clazz.getName()%>DTO(}*/ Modified: trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-08-22 16:24:45 UTC (rev 1042) +++ trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-08-26 08:35:26 UTC (rev 1043) @@ -94,7 +94,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; /** - * Implantation DTO for <%=Util.capitalize(clazz.getName())%> entity. + * Implantation DTO pour l'entité <%=Util.capitalize(clazz.getName())%>. *) public class <%=clazz.getName()%>DTO }*/ String extendClass = ""; @@ -180,7 +180,7 @@ } /*{ /** - * Default constructor of <%=clazz.getName()%>DTO. + * Constructeur de <%=clazz.getName()%>DTO par défaut. *) public <%=clazz.getName()%>DTO() {}

1 0

r1042 - trunk/topia2/src/java/org/codelutin/topia/framework
by ruchaud＠users.labs.libre-entreprise.org Aug. 22, 2008

Aug. 22, 2008

Author: ruchaud Date: 2008-08-22 16:24:45 +0000 (Fri, 22 Aug 2008) New Revision: 1042 Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: Gestion des arrays dans les requ?\195?\170tes HQL Modified: trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-21 17:19:18 UTC (rev 1041) +++ trunk/topia2/src/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-08-22 16:24:45 UTC (rev 1042) @@ -42,6 +42,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.Enumeration; @@ -813,7 +814,13 @@ try { Query query = getHibernate().createQuery(hql); for (int j = 0; j < args.length; j += 2) { - query.setParameter((String)args[j], args[j + 1]); + String name = (String)args[j]; + Object value = args[j + 1]; + if(value.getClass().isArray()) { + query.setParameterList(name, (Object[])value); + } else { + query.setParameter(name, value); + } } List result = query.list(); result = firesSupport.fireEntitiesLoad(this, result);

1 0

r1041 - in trunk/topia-service/src/java/org/codelutin/topia/taas: . jaas
by ruchaud＠users.labs.libre-entreprise.org Aug. 21, 2008

Aug. 21, 2008

Author: ruchaud Date: 2008-08-21 17:19:18 +0000 (Thu, 21 Aug 2008) New Revision: 1041 Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/TaasService.java trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java Log: Utilisation d'une transaction non s?\195?\169curis?\195?\169 pour la modification de l'utilisateur lors de la connexion Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/TaasService.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/taas/TaasService.java 2008-08-20 13:53:46 UTC (rev 1040) +++ trunk/topia-service/src/java/org/codelutin/topia/taas/TaasService.java 2008-08-21 17:19:18 UTC (rev 1041) @@ -38,6 +38,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Properties; import javax.security.auth.Subject; import javax.security.auth.login.Configuration; @@ -45,12 +46,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.event.TopiaTransactionEvent; import org.codelutin.topia.event.TopiaTransactionVetoable; +import org.codelutin.topia.framework.TopiaContextImpl; import org.codelutin.topia.framework.TopiaContextImplementor; import org.codelutin.topia.framework.TopiaService; +import org.codelutin.topia.framework.TopiaUtil; import org.codelutin.topia.persistence.TopiaDAO; import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.persistence.TopiaId; @@ -91,6 +95,7 @@ private TaasPolicy policy = new TaasPolicy(this); private TopiaContextImplementor rootContext; + private TopiaContext rootContextNoSecure; private TaasAccessEntity accessEntity; private TaasSubjectFinder subjectFinder; @@ -131,7 +136,7 @@ try { org.hibernate.cfg.Configuration configuration = rootContext.getHibernateConfiguration(); - // R�cup�ration du param�tre pour l'�v�nemnt + // Recuperation du parametre pour l'evenemnt String eventString = configuration.getProperty(SERVICE_EVENT); if(eventString != null && !"".equals(eventString)) { Class<TaasAccessEntity> eventClass = (Class<TaasAccessEntity>) Class.forName(eventString); @@ -141,7 +146,7 @@ accessEntity = new TaasEntityVetoable(this); } - // R�cup�ration du param�tre pour le subject + // Recuperation du parametre pour le subject String subjectString = configuration.getProperty(SERVICE_SUBJECT); if(subjectString != null && !"".equals(subjectString)) { Class<TaasSubjectFinder> subjectClass = (Class<TaasSubjectFinder>) Class.forName(subjectString); @@ -150,9 +155,22 @@ subjectFinder = new TaasSubjectFinderImpl(); } + // Recupere un context root sans securite + Properties config = rootContext.getConfig(); + + config.remove("topia.service.taas"); + String persistences = config.getProperty("topia.persistence.classes"); + for (Class klass : getPersistenceClasses()) { + persistences += "," + klass.getName(); + } + config.setProperty("topia.persistence.classes", persistences); + + rootContextNoSecure = TopiaContextFactory.getContext(config); + } catch (Exception e) { throw new SecurityException("Init security error", e); } + return true; } @@ -206,6 +224,14 @@ } /** + * Permet de recuperer un context root sans securite + * @return context root non securise + */ + public TopiaContext getRootContextNoSecure() throws TopiaException { + return rootContextNoSecure; + } + + /** * Permet de r�cup�rer le subject en cours * @return subject */ Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-20 13:53:46 UTC (rev 1040) +++ trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-21 17:19:18 UTC (rev 1041) @@ -37,6 +37,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; +import java.util.Properties; import java.util.Set; import javax.security.auth.Subject; @@ -50,8 +51,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; import org.codelutin.topia.TopiaServiceDAOHelper; +import org.codelutin.topia.framework.TopiaContextImpl; +import org.codelutin.topia.framework.TopiaUtil; import org.codelutin.topia.taas.TaasService; import org.codelutin.topia.taas.TaasUtil; import org.codelutin.topia.taas.entities.TaasPrincipal; @@ -129,7 +133,7 @@ //Vérification du login/pass et récupération des Principals try { - TopiaContext rootContext = taasService.getRootContext(); + TopiaContext rootContext = taasService.getRootContextNoSecure(); TopiaContext transaction = rootContext.beginTransaction(); TaasUserDAO userDAO = TopiaServiceDAOHelper.getTaasUserDAO(transaction); @@ -158,6 +162,7 @@ throw new LoginException("Erreur lors de l'authentification " + login); } + transaction.commitTransaction(); transaction.closeContext(); } catch (TopiaException te) { // Echec de récupération de l'utilisateur

1 0