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

r1040 - in trunk/topia-service: . src/java/org/codelutin/topia/migration
by bpoussin＠users.labs.libre-entreprise.org 20 Aug '08

20 Aug '08

Author: bpoussin Date: 2008-08-20 13:53:46 +0000 (Wed, 20 Aug 2008) New Revision: 1040 Modified: trunk/topia-service/changelog trunk/topia-service/src/java/org/codelutin/topia/migration/DatabaseManager.java Log: ajout de la method getConnection (qui bizarrement avait disparu) Modified: trunk/topia-service/changelog =================================================================== --- trunk/topia-service/changelog 2008-08-11 14:25:22 UTC (rev 1039) +++ trunk/topia-service/changelog 2008-08-20 13:53:46 UTC (rev 1040) @@ -1,3 +1,7 @@ +0.9 + * <poussin> modif dans service de migration pour permettre a l'app de + faire la migration via le callback + 0.8 * 20071120 [chatellier] update topia-service site Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/DatabaseManager.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/DatabaseManager.java 2008-08-11 14:25:22 UTC (rev 1039) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/DatabaseManager.java 2008-08-20 13:53:46 UTC (rev 1040) @@ -109,6 +109,17 @@ } /** + * retourne une {@link Connection}, charge a l'appelant de la fermer par la + * suite + * @return + */ + public Connection getConnection() { + Connection result = sessionFactory.openStatelessSession().connection(); + return result; + } + + + /** * Retourne la version de la base * @return la version present en base, ou <tt>null</tt> si la version ne peut pas etre determinee */

1 0

r1039 - in trunk/topia-service/src: java/org/codelutin/topia/migration resources
by bpoussin＠users.labs.libre-entreprise.org 11 Aug '08

11 Aug '08

Author: bpoussin Date: 2008-08-11 14:25:22 +0000 (Mon, 11 Aug 2008) New Revision: 1039 Added: trunk/topia-service/src/resources/oldmappings/ Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java Log: Correction erreur d'initialisation de variable. En fait si le schema de version n'etait pas trouve et que l'app etait bien en version 0 (donc rien a faire), il y avait tout de meme une Exception de leve de mauvaise init topia Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-11 08:39:30 UTC (rev 1038) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-11 14:25:22 UTC (rev 1039) @@ -243,7 +243,7 @@ // tel if migration is needed boolean bMigrationNeeded = false; // tel if migration is wanted - MigrationChoice bMigrationWanted = null; + MigrationChoice bMigrationWanted = MigrationChoice.NO_MIGRATION; // test if schema exist in database... // if not, the schema must be created @@ -271,6 +271,7 @@ logger.info("Handler choose : " + bMigrationWanted); } else { + bMigrationNeeded = false; logger.info("Database is up to date, no migration needed."); }

1 0

r1038 - trunk/topia2/src/java/org/codelutin/topia/generator
by eore＠users.labs.libre-entreprise.org 11 Aug '08

11 Aug '08

Author: eore Date: 2008-08-11 08:39:30 +0000 (Mon, 11 Aug 2008) New Revision: 1038 Modified: trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java Log: commentaires en anglais Modified: trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-08-08 16:29:29 UTC (rev 1037) +++ trunk/topia2/src/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-08-11 08:39:30 UTC (rev 1038) @@ -94,7 +94,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; /** - * Implantation DTO pour l'entité <%=Util.capitalize(clazz.getName())%>. + * Implantation DTO for <%=Util.capitalize(clazz.getName())%> entity. *) public class <%=clazz.getName()%>DTO }*/ String extendClass = ""; @@ -180,7 +180,7 @@ } /*{ /** - * Constructeur de <%=clazz.getName()%>DTO par défaut. + * Default constructor of <%=clazz.getName()%>DTO. *) public <%=clazz.getName()%>DTO() {}

1 0

r1037 - trunk/topia-service/src/xmi
by ruchaud＠users.labs.libre-entreprise.org 08 Aug '08

08 Aug '08

Author: ruchaud Date: 2008-08-08 16:29:29 +0000 (Fri, 08 Aug 2008) New Revision: 1037 Modified: trunk/topia-service/src/xmi/TopiaService.zargo Log: Ajout du lien vers l'application qui utilise taas Modified: trunk/topia-service/src/xmi/TopiaService.zargo =================================================================== (Binary files differ)

1 0

r1036 - trunk/topia-service/src/java/org/codelutin/topia/taas/jaas
by ruchaud＠users.labs.libre-entreprise.org 08 Aug '08

08 Aug '08

Author: ruchaud Date: 2008-08-08 16:28:30 +0000 (Fri, 08 Aug 2008) New Revision: 1036 Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java Log: Ajout de l'utilisateur dans le private credential 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-07 13:32:06 UTC (rev 1035) +++ trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-08 16:28:30 UTC (rev 1036) @@ -69,6 +69,7 @@ protected Subject subject; protected CallbackHandler callbackHandler; protected Set<TaasPrincipalWrapper> principals; + protected TaasUser privateCredential; protected TaasService taasService; /* (non-Javadoc) @@ -83,6 +84,7 @@ this.subject = subject; this.callbackHandler = callbackHandler; this.principals = null; + this.privateCredential = null; this.taasService = (TaasService)options.get(TaasService.SERVICE_NAME); } @@ -134,6 +136,8 @@ TaasUser user = userDAO.findByLogin(login); if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { + privateCredential = user; + // Update connection information user.setLastConnectionDate(new Date()); int numberOfConnection = user.getNumberOfConnection(); @@ -141,16 +145,16 @@ user.update(); // Récupération des principals - principals = new HashSet<TaasPrincipalWrapper>(); + principals = new HashSet<TaasPrincipalWrapper>(); Collection<TaasPrincipal> taasPrincipals = user.getPrincipals(); for (TaasPrincipal taasPrincipal : taasPrincipals) { - principals.add(new TaasPrincipalWrapper(taasPrincipal)); + principals.add(new TaasPrincipalWrapper(taasPrincipal)); } - } else { // Echec d'authentification principals = null; + privateCredential = null; throw new LoginException("Erreur lors de l'authentification " + login); } @@ -173,6 +177,7 @@ */ public boolean commit() throws LoginException { subject.getPrincipals().addAll(principals); + subject.getPrivateCredentials().add(privateCredential); return true; }

1 0

r1035 - trunk/topia-service/src/xmi
by ruchaud＠users.labs.libre-entreprise.org 07 Aug '08

07 Aug '08

Author: ruchaud Date: 2008-08-07 13:32:06 +0000 (Thu, 07 Aug 2008) New Revision: 1035 Modified: trunk/topia-service/src/xmi/TopiaService.zargo Log: Modification de la relation entre le profil et les authorisations Modified: trunk/topia-service/src/xmi/TopiaService.zargo =================================================================== (Binary files differ)

1 0

r1034 - trunk/topia-service/src/xmi
by ruchaud＠users.labs.libre-entreprise.org 07 Aug '08

07 Aug '08

Author: ruchaud Date: 2008-08-07 13:16:22 +0000 (Thu, 07 Aug 2008) New Revision: 1034 Modified: trunk/topia-service/src/xmi/TopiaService.zargo Log: Chargement des authorizations lors du chargement du profil Modified: trunk/topia-service/src/xmi/TopiaService.zargo =================================================================== (Binary files differ)

1 0

r1033 - trunk/topia2/src/java/org/codelutin/topia/generator
by ruchaud＠users.labs.libre-entreprise.org 07 Aug '08

07 Aug '08

Author: ruchaud Date: 2008-08-07 13:14:35 +0000 (Thu, 07 Aug 2008) New Revision: 1033 Modified: trunk/topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Ajout d'un tag fecth pour le mapping hibernate Modified: trunk/topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-08-07 12:43:55 UTC (rev 1032) +++ trunk/topia2/src/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-08-07 13:14:35 UTC (rev 1033) @@ -343,9 +343,14 @@ } lazy += "\""; + String fetch = ""; + if (attr.getTagValue("fetch") != null){ + fetch = "fetch=\"" + attr.getTagValue("fetch") + "\""; + } + String collType = GeneratorUtil.getNMultiplicityHibernateType(attr); if (!needsIndex) { -/*{ <<%=collType%> name="<%=getName(attr)%>" <%=orderBy%> <%=((!isInverse)?"":"inverse=\"true\"")%> <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="true"> +/*{ <<%=collType%> name="<%=getName(attr)%>" <%=orderBy%> <%=((!isInverse)?"":"inverse=\"true\"")%> <%=fetch%> <%=lazy%> <%=cascade%> node="<%=getName(attr)%>" embed-xml="true"> <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/> <one-to-many class="<%=getType(attr)%>" node="topiaId" embed-xml="false"/> </<%=collType%>>

1 0

r1032 - in trunk/topia-service/src: java/org/codelutin/topia/taas/jaas xmi
by ruchaud＠users.labs.libre-entreprise.org 07 Aug '08

07 Aug '08

Author: ruchaud Date: 2008-08-07 12:43:55 +0000 (Thu, 07 Aug 2008) New Revision: 1032 Modified: trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java trunk/topia-service/src/xmi/TopiaService.zargo Log: Ajout des informations de connexion 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-06 13:13:15 UTC (rev 1031) +++ trunk/topia-service/src/java/org/codelutin/topia/taas/jaas/TaasLoginModule.java 2008-08-07 12:43:55 UTC (rev 1032) @@ -34,6 +34,7 @@ import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -133,6 +134,12 @@ TaasUser user = userDAO.findByLogin(login); if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { + // Update connection information + user.setLastConnectionDate(new Date()); + int numberOfConnection = user.getNumberOfConnection(); + user.setNumberOfConnection(numberOfConnection + 1); + user.update(); + // Récupération des principals principals = new HashSet<TaasPrincipalWrapper>(); Modified: trunk/topia-service/src/xmi/TopiaService.zargo =================================================================== (Binary files differ)

1 0

r1031 - in trunk/topia-service/src: . java/org/codelutin/topia/migration java/org/codelutin/topia/migration/callback
by bpoussin＠users.labs.libre-entreprise.org 06 Aug '08

06 Aug '08

Author: bpoussin Date: 2008-08-06 13:13:15 +0000 (Wed, 06 Aug 2008) New Revision: 1031 Added: trunk/topia-service/src/resources/ Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java Log: Passage de DatabaseManager dans le callback pour reellement le rendre utilisable si on souhaite faire la migration soit meme, il faut disposer d'une connexion a la base. Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-05 17:54:54 UTC (rev 1030) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-06 13:13:15 UTC (rev 1031) @@ -266,7 +266,7 @@ bMigrationNeeded = true; // ask handler for migration - bMigrationWanted = askHandlerForMigration(vdbVersion.getVersion(),currentApplicationVersion.getVersion()); + bMigrationWanted = askHandlerForMigration(dbManager, vdbVersion.getVersion(),currentApplicationVersion.getVersion()); logger.info("Handler choose : " + bMigrationWanted); } @@ -430,13 +430,15 @@ * * @return <tt>true</tt> or <tt>false</tt> */ - protected MigrationChoice askHandlerForMigration(String databaseVersion, String applicationVersion) { + protected MigrationChoice askHandlerForMigration(DatabaseManager dbManager, + String databaseVersion, String applicationVersion) { // true par defaut, s'il n'y a pas de handlers MigrationChoice result = MigrationChoice.MIGRATION; for(MigrationCallbackHandler callback : migrationCallBackHandlers) { - MigrationChoice thiscallbackResult = callback.doMigration(databaseVersion, applicationVersion); + MigrationChoice thiscallbackResult = callback.doMigration(dbManager, + databaseVersion, applicationVersion); // hack , si un des callback repond CUSTOM_MIGRATION // ca sera CUSTOM_MIGRATION Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java 2008-08-05 17:54:54 UTC (rev 1030) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java 2008-08-06 13:13:15 UTC (rev 1031) @@ -18,6 +18,8 @@ package org.codelutin.topia.migration.callback; +import org.codelutin.topia.migration.DatabaseManager; + /** * MigrationCallBackHandler * @@ -44,9 +46,10 @@ /** * Ask for migration * + * @param un objet permettant d'ouvrir des connexions sur la base * @param databaseVersion database version * @param applicationVersion application version * @return migration aggrement */ - public MigrationChoice doMigration(String databaseVersion, String applicationVersion); + public MigrationChoice doMigration(DatabaseManager dbManager, String databaseVersion, String applicationVersion); }

1 0