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

r2560 - in branches: . topia-2.6-maintenance
by athimel＠users.nuiton.org 30 May '12

30 May '12

Author: athimel Date: 2012-05-30 09:35:45 +0200 (Wed, 30 May 2012) New Revision: 2560 Url: http://nuiton.org/repositories/revision/topia/2560 Log: Create maintenance branch for ToPIA 2.6.x Added: branches/topia-2.6-maintenance/ Property changes on: branches/topia-2.6-maintenance ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2559 - branches/topia-2.6.x
by athimel＠users.nuiton.org 30 May '12

30 May '12

Author: athimel Date: 2012-05-30 09:33:08 +0200 (Wed, 30 May 2012) New Revision: 2559 Url: http://nuiton.org/repositories/revision/topia/2559 Log: Remove wrong branche location Removed: branches/topia-2.6.x/topia-2.6.10/

1 0

r2558 - in branches/topia-2.6.x: . topia-2.6.10
by athimel＠users.nuiton.org 30 May '12

30 May '12

Author: athimel Date: 2012-05-30 09:27:17 +0200 (Wed, 30 May 2012) New Revision: 2558 Url: http://nuiton.org/repositories/revision/topia/2558 Log: Create maintenance branche for ToPIA 2.6.x Added: branches/topia-2.6.x/topia-2.6.10/ Property changes on: branches/topia-2.6.x/topia-2.6.10 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2557 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 18:38:29 +0200 (Tue, 29 May 2012) New Revision: 2557 Url: http://nuiton.org/repositories/revision/topia/2557 Log: fixes #2075 method without bounds is now called findAll This might introduce a non-backward compatibility, but it's still better than the actual name Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -363,7 +363,7 @@ * @return The result list * @throws TopiaException for any error during querying */ - List find(String jpaql, Object... paramNamesAndValues) + List findAll(String jpaql, Object... paramNamesAndValues) throws TopiaException; /** 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 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -152,8 +152,9 @@ * * The normal usage is to says yes (that's why the default value is * {@code true}), in that case whebn doing queries (says in method - * {@link #find(String, Object...)} or {@link #find(String, int, int, Object...)}) - * it will use the flush mode {@link javax.persistence.FlushModeType#AUTO}). + * {@link #findAll(String, Object...)} or + * {@link #find(String, int, int, Object...)}) it will use the flush mode + * {@link javax.persistence.FlushModeType#AUTO}). * * But sometimes, when doing a lot of queries (for some imports for example), * we do NOT want the session to be flushed each time we do a find, then you @@ -859,7 +860,7 @@ } @Override - public List<?> find(String jpaql, Object... paramNamesAndValues) { + public List<?> findAll(String jpaql, Object... paramNamesAndValues) { List<?> result = find(jpaql, 0, -1, paramNamesAndValues); return result; } @@ -1264,7 +1265,7 @@ log.debug("acquire entities " + query); } // acquire data to replicate - List<?> entities = find(query); + List<?> entities = findAll(query); replicateOnDestinationContext(destinationContextImpl, entities.toArray()); if (log.isDebugEnabled()) { log.debug("replication of entities " + query + Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -48,7 +48,7 @@ import java.util.Map; /** - * Query HQL managment to simplify usage of {@link TopiaContext#find(String, + * Query HQL managment to simplify usage of {@link TopiaContext#findAll(String, * Object...) }. * * TODO-FD20091224 JUnit Tests @@ -74,7 +74,7 @@ * SQL : * "SELECT * FROM PersonImpl WHERE firstName LIKE 'M%' AND year > 1980" * - * HQL using {@link TopiaContext#find(String, Object...) } : + * HQL using {@link TopiaContext#findAll(String, Object...) } : * TopiaContext context = rootContext.beginTransaction(); * context.find("FROM " + Person.class.getName() + " WHERE firstName LIKE * :firstName AND year > :year", @@ -92,7 +92,7 @@ * Example 2 : * ----------- * - * HQL using {@link TopiaContext#find(String, Object...) } : + * HQL using {@link TopiaContext#findAll(String, Object...) } : * TopiaContext context = rootContext.beginTransaction(); * * String query = "FROM " + Person.class.getName(); @@ -168,7 +168,7 @@ * ---------------- * * - execute : as the same result as - * {@link TopiaContext#find(String, Object...) } + * {@link TopiaContext#findAll(String, Object...) } * * Depends on entity type ; * ------------------------ @@ -1317,7 +1317,7 @@ * @param transaction the TopiaContext to use for execution * @return a List of results * @throws TopiaException for error on query execution - * @see TopiaContext#find(String, Object...) + * @see TopiaContext#findAll(String, Object...) */ public List execute(TopiaContext transaction) throws TopiaException { String query = fullQuery(); @@ -1329,7 +1329,7 @@ result = transaction.find(query, startIndex, endIndex, getParams().toArray()); } else { - result = transaction.find(query, getParams().toArray()); + result = transaction.findAll(query, getParams().toArray()); } return result; }

1 0

r2556 - in trunk: . topia-service-migration topia-tutorial
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 18:36:57 +0200 (Tue, 29 May 2012) New Revision: 2556 Url: http://nuiton.org/repositories/revision/topia/2556 Log: refs #2088 Remove maven-i18n-plugin usage Modified: trunk/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-tutorial/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) +++ trunk/pom.xml 2012-05-29 16:36:57 UTC (rev 2556) @@ -386,12 +386,6 @@ </plugin> <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> - - <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) +++ trunk/topia-service-migration/pom.xml 2012-05-29 16:36:57 UTC (rev 2556) @@ -112,20 +112,7 @@ </resources> <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + </build> </project> Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) +++ trunk/topia-tutorial/pom.xml 2012-05-29 16:36:57 UTC (rev 2556) @@ -131,20 +131,6 @@  <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <id>make-bundle</id> - <configuration> - <bundleOutputName>library-bundle</bundleOutputName> - </configuration> - <goals> -  - <goal>bundle</goal> - </goals> - </execution> - </executions> </plugin> </plugins>

1 0

r2555 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-migration/src/main/resources topia-service-replication/src/main/java/org/nuiton/topia/replication topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/main/resources topia-service-security topia-tutorial
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 18:16:19 +0200 (Tue, 29 May 2012) New Revision: 2555 Url: http://nuiton.org/repositories/revision/topia/2555 Log: fixes #2088 remove i18n from ToPIA Removed: trunk/topia-service-migration/src/main/resources/i18n/ trunk/topia-service-replication/src/main/resources/i18n/ Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-migration/pom.xml trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java trunk/topia-service-security/pom.xml trunk/topia-tutorial/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -79,9 +79,6 @@ <mockitoVersion>1.9.0</mockitoVersion> <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion> -  - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - </properties> <dependencyManagement> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -57,8 +57,6 @@ import java.util.SortedMap; import java.util.TreeMap; -import static org.nuiton.i18n.I18n._; - /** * Une classe avec des méthodes utiles sur les entités. * @@ -1160,7 +1158,7 @@ public static void checkSize(int size, Object[] params) { if (params.length != size) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.size", size, params.length)); + String.format("Invalid parameters size. Expected:%d but was:%d", size, params.length)); } } @@ -1171,13 +1169,13 @@ Object value = params[index]; if (value == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param.in.array", index)); + String.format("The parameter at index %d must not be null", index)); } Class<?> foundType = value.getClass(); if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.type.in.array", + String.format("The parameter at index %d is not the expected type. Expected:%s but was:%s", index, requiredType, foundType)); } } Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -64,11 +64,6 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -38,8 +38,6 @@ import java.sql.SQLException; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Abstract migration callback. * @@ -115,7 +113,7 @@ try { - log.info(_("topia.migration.start.migrate", v)); + log.info(String.format("Start migration to version %s", v)); migrateForVersion(v, tx, showSql, showProgression); 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 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -49,8 +49,6 @@ import java.util.SortedSet; import java.util.TreeSet; -import static org.nuiton.i18n.I18n._; - /** * Le moteur de migration proposé par topia. Il est basé sur un {@link AbstractTopiaMigrationCallback} * qui donne la version de l'application, les version de mises à jour disponibles. @@ -276,9 +274,9 @@ boolean complete = migrateSchema(); if (!complete) { if (log.isErrorEnabled()) { - log.error(_("topia.migration.migration.incomplete")); + log.error("Database migration failed !"); } - throw new TopiaException(_("topia.migration.migration.incomplete")); + throw new TopiaException("Database migration failed !"); } } @@ -295,10 +293,14 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", - version.getVersion(), - dbVersion.getVersion()) - ); + if (log.isInfoEnabled()) { + String message = String.format( + "Starting Topia Migration Service - " + + "Application version : %s, Database version : %s", + version.getVersion(), + dbVersion.getVersion()); + log.info(message); + } if (log.isDebugEnabled()) { log.debug("Migrate schema to version = " + dbVersion); @@ -315,7 +317,7 @@ if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info("Database is up to date, no migration needed."); } // la base est a jour return true; @@ -323,7 +325,7 @@ // Aucune version existante, la base de données est vierge if (versionTableExist && dbNotVersioned && migrateOnInit) { - log.info(_("topia.migration.skip.migration.db.is.empty")); + log.info("Database is empty, no migration needed."); // la base est vierge, aucune migration nécessaire // mise à jour de la table tmsversion saveApplicationVersion(); @@ -335,7 +337,7 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info("Database is up to date, no migration needed."); } // la base est a jour mais il faut migrer la table saveApplicationVersion(); @@ -346,7 +348,7 @@ new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); if (log.isInfoEnabled()) { - log.info(_("topia.migration.available.versions", allVersions)); + log.info(String.format("Available versions: %s", allVersions)); } // tell if migration is needed @@ -365,11 +367,11 @@ if (versionsToApply.isEmpty()) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + log.info("No version to apply, no migration needed."); } } else { if (log.isInfoEnabled()) { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + log.info(String.format("Versions to apply : %s", versionsToApply)); } // perform the migration @@ -455,7 +457,7 @@ TMSVersionDAO.deleteAll(tx); if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); + log.info(String.format("Saving new database version : %s", version)); } // create new version and store it in table @@ -558,9 +560,9 @@ // etre detenu en local v = Version.VZERO; dbNotVersioned = true; - log.info(_("topia.migration.db.not.versionned")); + log.info("Database version not found, so database schema is considered as V0"); } else { - log.info(_("topia.migration.detected.db.version", v)); + log.info(String.format("detected database version : %s", v)); } dbVersion = v; versionDetected = true; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -38,8 +38,6 @@ import java.util.Arrays; import java.util.Set; -import static org.nuiton.i18n.I18n._; - /** * Builder of {@link ReplicationModel}. * @@ -128,7 +126,7 @@ if (operation == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.operation", + String.format("The operation %s is unknown, known operations are : %s", operationClass.getSimpleName(), Arrays.toString(getOperationProvider().getOperations())) ); @@ -137,7 +135,7 @@ ReplicationNode node = model.getNode(type); if (node == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.owner.node", + String.format("The target node (of type %s) for operation %s is unknown, known nodes are : %s", type, operationClass.getSimpleName(), model.getNodes()) Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -43,8 +43,6 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Pour attacher une association. * @@ -118,7 +116,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(String.format("Nothing to attach for owner %s...", ownerOperator)); return; } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -41,8 +41,6 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Pour charger une association sur le noeud de l'operation. * @@ -74,7 +72,7 @@ if (!ownerNode.equals(operationDef.getNode())) { throw new IllegalStateException( - _("topia.replication.error.operation.loadLink.illegalSource", + String.format("The source node of loading association requires the node %s, but was %s.", operationDef.getNode(), ownerNode)); } Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-security/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -62,11 +62,6 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-tutorial/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -34,11 +34,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId>

1 0

r2554 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-migration/src/main/java/org/nuiton/topia/migration
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 17:44:36 +0200 (Tue, 29 May 2012) New Revision: 2554 Url: http://nuiton.org/repositories/revision/topia/2554 Log: Avoid using TopiaContextListener Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2012-05-29 15:40:37 UTC (rev 2553) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2012-05-29 15:44:36 UTC (rev 2554) @@ -959,6 +959,7 @@ propertyChangeListeners.add(listener); } + @Deprecated public void addTopiaContextListener(TopiaSchemaListener listener) { if (listener == null) { throw new NullPointerException("Listener can not be null."); @@ -1022,6 +1023,7 @@ propertyChangeListeners.remove(listener); } + @Deprecated public void removeTopiaContextListener(TopiaSchemaListener listener) { if (listener == null) { throw new NullPointerException("Listener can not be null."); 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 2012-05-29 15:40:37 UTC (rev 2553) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 15:44:36 UTC (rev 2554) @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.event.TopiaContextAdapter; import org.nuiton.topia.event.TopiaContextEvent; -import org.nuiton.topia.event.TopiaContextListener; +import org.nuiton.topia.event.TopiaSchemaListener; import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -119,7 +119,7 @@ protected boolean showProgression; /** delegate context listener. */ - protected final TopiaContextListener contextListener; + protected final TopiaSchemaListener schemaListener; /** delgate transaction listener */ protected final TopiaTransactionVetoable transactionVetoable; @@ -134,11 +134,11 @@ (TopiaContextImplementor) event.getSource(); // add topia context listener - context.addTopiaContextListener(contextListener); + context.addTopiaSchemaListener(schemaListener); } }; - contextListener = new TopiaContextAdapter() { + schemaListener = new TopiaContextAdapter() { @Override public void postCreateSchema(TopiaContextEvent event) { @@ -238,7 +238,7 @@ init = true; // add topia context listener - context.addTopiaContextListener(contextListener); + context.addTopiaSchemaListener(schemaListener); context.addTopiaTransactionVetoable(transactionVetoable); if (log.isDebugEnabled()) {

1 0

r2553 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence topia-service-migration/src/main/java/org/nuiton/topia/migration
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 17:40:37 +0200 (Tue, 29 May 2012) New Revision: 2553 Url: http://nuiton.org/repositories/revision/topia/2553 Log: #refs #1945 TopiaRuntimeException deleted TopiaException is now runtime Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java Modified: trunk/pom.xml trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/pom.xml 2012-05-29 15:40:37 UTC (rev 2553) @@ -73,7 +73,6 @@ <processorPluginVersion>1.2.2</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> -  <hibernateVersion>4.1.3.Final</hibernateVersion> <sl4jVersion>1.6.4</sl4jVersion> <h2Version>1.3.167</h2Version> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -26,20 +26,24 @@ package org.nuiton.topia; /** - * Main exception for Topia errors on hibernate manipulations. - * + * Main exception for ToPIA manipulation errors (entity class not found, context + * unavailable, invalid state, access denied, ...). Since ToPIA 3.0, this + * exception is unchecked. + * * Created: 23 déc. 2005 23:03:36 * * @author poussin <poussin(a)codelutin.com> * @version $Id$ */ -public class TopiaException extends Exception { +public class TopiaException extends RuntimeException { - /** Version UID */ - private static final long serialVersionUID = -1251439453383121393L; + /** + * Version UID + */ + private static final long serialVersionUID = 3692450097443844102L; /** - * Default constructor. + * Default constructor. */ public TopiaException() { } @@ -58,7 +62,7 @@ * with a {@code message}. * * @param message exception message - * @param cause exception cause + * @param cause exception cause */ public TopiaException(String message, Throwable cause) { super(message, cause); Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -1,74 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topia; - -/** - * TODO-FD20100507 : Need javadoc. - * - * @author chatellier <chatellier(a)codelutin.com> - * @version $Id$ - */ -public class TopiaRuntimeException extends RuntimeException { - - /** Version UID */ - private static final long serialVersionUID = 4706337137948838375L; - - /** - * Default constructor. - */ - public TopiaRuntimeException() { - } - - /** - * Constructor with {@code message}. - * - * @param message exception message - */ - public TopiaRuntimeException(String message) { - super(message); - } - - /** - * Constructor for a wrapped TopiaRuntimeException over a {@code cause} - * with a {@code message}. - * - * @param message exception message - * @param cause exception cause - */ - public TopiaRuntimeException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Constructor for a wrapped TopiaRuntimeException over a {@code cause}. - * - * @param cause exception cause - */ - public TopiaRuntimeException(Throwable cause) { - super(cause); - } - -} 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 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -43,7 +43,6 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaEntitiesVetoable; import org.nuiton.topia.event.TopiaEntityListener; @@ -304,7 +303,7 @@ } @Override - public EntityManager getEntityManager() throws TopiaException { + public EntityManager getEntityManager() { if (entityManager == null) { throw new TopiaException( "No EntityManager found. Please open first a new " + @@ -334,7 +333,7 @@ result = getParentContext().getSpecificUtil(); } if (result == null) { - throw new TopiaRuntimeException("No TopiaSpecificUtil found."); + throw new TopiaException("No TopiaSpecificUtil found."); } return result; } @@ -471,7 +470,7 @@ @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) - throws TopiaException { + { if (entityClass == null) { String message = String.format( "The method '%s' requires a non null parameter '%s'.", @@ -531,7 +530,7 @@ @Override public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO( - Class<E> entityClass, Class<D> daoClass) throws TopiaException { + Class<E> entityClass, Class<D> daoClass) { return (D) getDAO(entityClass); } @@ -539,7 +538,7 @@ /* -------------------- TRANSACTION MANAGEMENT --------------------------*/ @Override - public TopiaContext beginTransaction() throws TopiaException { + public TopiaContext beginTransaction() { checkClosed("beginTransaction"); TopiaContextImpl result = new TopiaContextImpl(this); @@ -588,7 +587,7 @@ } @Override - public void commitTransaction() throws TopiaException { + public void commitTransaction() { if (TopiaPredicates.IS_ROOT_CONTEXT.apply(this)) { String message = String.format("Operation '%s' is not permitted on root context", "commitTransaction"); throw new TopiaException(message); @@ -616,7 +615,7 @@ } @Override - public void rollbackTransaction() throws TopiaException { + public void rollbackTransaction() { if (TopiaPredicates.IS_ROOT_CONTEXT.apply(this)) { String message = String.format("Operation '%s' is not permitted on root context", "rollbackTransaction"); throw new TopiaException(message); @@ -648,7 +647,7 @@ } @Override - public void closeContext() throws TopiaException { + public void closeContext() { checkClosed("closeContext"); // Remove all children context @@ -691,7 +690,7 @@ return closed; } - protected void checkClosed(String method) throws TopiaException { + protected void checkClosed(String method) { if (closed) { String message = String.format( "This context is closed, unable to perform operation '%s'", @@ -840,7 +839,7 @@ /* -------------------- GLOBAL OPERATIONS ON ENTITIES --------------------*/ @Override - public TopiaEntity findByTopiaId(String id) throws TopiaException { + public TopiaEntity findByTopiaId(String id) { checkClosed("findByTopiaId"); Class<TopiaEntity> entityClass = TopiaIdUtil.getClassName(id); @@ -850,7 +849,7 @@ } @Override - public List<?> findByQuery(TopiaQuery query) throws TopiaException { + public List<?> findByQuery(TopiaQuery query) { return query.execute(this); } @@ -860,7 +859,7 @@ } @Override - public List<?> find(String jpaql, Object... paramNamesAndValues) throws TopiaException { + public List<?> find(String jpaql, Object... paramNamesAndValues) { List<?> result = find(jpaql, 0, -1, paramNamesAndValues); return result; } @@ -875,7 +874,7 @@ @Override public List<?> find(String jpaql, int startIndex, int endIndex, Object... paramNamesAndValues) - throws TopiaException { + { checkClosed("find"); try { @@ -905,7 +904,7 @@ } @Override - public int execute(String jpaql, Object... paramNamesAndValues) throws TopiaException { + public int execute(String jpaql, Object... paramNamesAndValues) { checkClosed("execute"); try { @@ -926,7 +925,7 @@ } @Override - public void add(TopiaEntity e) throws TopiaException { + public void add(TopiaEntity e) { checkClosed("add"); String id = e.getTopiaId(); @@ -937,7 +936,7 @@ } @Override - public void executeSQL(String sqlScript) throws TopiaException { + public void executeSQL(String sqlScript) { try { Query nativeQuery = getEntityManager().createNativeQuery(sqlScript); nativeQuery.executeUpdate(); @@ -966,18 +965,15 @@ } } return true; - } catch (TopiaException te) { - throw new TopiaRuntimeException( - "Unable to detect if schema is empty", te); } catch (ClassNotFoundException cnfe) { - throw new TopiaRuntimeException( + throw new TopiaException( "Unable to detect if schema is empty", cnfe); } } @Override public boolean isSchemaExist(Class<?> clazz) - throws TopiaException { + { checkClosed("isSchemaExist"); boolean result = getSpecificUtil().isTableExists(clazz); @@ -991,7 +987,7 @@ } @Override - public void createSchema() throws TopiaException { + public void createSchema() { try { boolean showSchema = log.isDebugEnabled(); getFiresSupport().firePreCreateSchema(this); @@ -1005,7 +1001,7 @@ } @Override - public void showCreateSchema() throws TopiaException { + public void showCreateSchema() { try { getSpecificUtil().showCreateSchema(); } catch (PersistenceException eee) { @@ -1016,7 +1012,7 @@ } @Override - public void updateSchema() throws TopiaException { + public void updateSchema() { try { boolean showSchema = log.isDebugEnabled(); getFiresSupport().firePreUpdateSchema(this); @@ -1184,7 +1180,7 @@ /* ------------------ IMPORT / EXPORT / REPLICATION ---------------------*/ @Override - public void importXML(Reader xml) throws TopiaException { + public void importXML(Reader xml) { checkClosed("importXML"); Document doc; @@ -1213,7 +1209,7 @@ @Override public void exportXML(Writer xml, Object... entityAndCondition) - throws TopiaException { + { checkClosed("exportXML"); List<String> queries = buildQueries(entityAndCondition); @@ -1251,7 +1247,7 @@ @Override public void replicate(TopiaContext destinationContext, Object... entityAndCondition) - throws TopiaException, IllegalArgumentException { + throws IllegalArgumentException { checkClosed("replicate"); TopiaContextImpl destinationContextImpl = (TopiaContextImpl) destinationContext; @@ -1284,7 +1280,7 @@ @Override public <T extends TopiaEntity> void replicateEntity(TopiaContext destinationContext, T entity) - throws TopiaException, IllegalArgumentException { + throws IllegalArgumentException { checkClosed("replicateEntity"); TopiaContextImpl destinationContextImpl = (TopiaContextImpl) destinationContext; @@ -1299,7 +1295,7 @@ @Override public <T extends TopiaEntity> void replicateEntities(TopiaContext destinationContext, List<T> entities) - throws TopiaException, IllegalArgumentException { + throws IllegalArgumentException { checkClosed("replicateEntities"); TopiaContextImpl destinationContextImpl = (TopiaContextImpl) destinationContext; @@ -1320,13 +1316,13 @@ * * @param entityAndCondition the list of tuples (Class,String) * @return the list of queries. - * @throws TopiaException if any pb of db while getting entities + * @ if any pb of db while getting entities * classes. * @throws IllegalArgumentException if any pb with the given parameter * (mainly ClassCastException). */ protected List<String> buildQueries(Object... entityAndCondition) - throws TopiaException, IllegalArgumentException { + throws IllegalArgumentException { Class<?> entityClass; String condition; @@ -1382,7 +1378,7 @@ protected void replicateOnDestinationContext( TopiaContextImplementor destinationContext, - Object... entities) throws TopiaException { + Object... entities) { try { for (Object entity : entities) { // detach entity from the source session, to make possible copy @@ -1404,17 +1400,17 @@ } @Override - public void backup(File file, boolean compress) throws TopiaException { + public void backup(File file, boolean compress) { new TopiaH2Util(this).backup(file, compress); } @Override - public void restore(File file) throws TopiaException { + public void restore(File file) { new TopiaH2Util(this).restore(file); } @Override - public void clear(boolean dropDatabase) throws TopiaException { + public void clear(boolean dropDatabase) { new TopiaH2Util(this).clear(dropDatabase); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPersistenceProvider.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -24,7 +24,7 @@ package org.nuiton.topia.framework; import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.TopiaException; import javax.persistence.EntityManagerFactory; import javax.persistence.spi.PersistenceProvider; @@ -69,14 +69,14 @@ Set<Class<?>> entityClasses = (Set<Class<?>>) map.get(TOPIA_ENTITIES); if (entityClasses == null) { String message = String.format(MISSING_PROPERTY, TOPIA_ENTITIES); - throw new TopiaRuntimeException(message); + throw new TopiaException(message); } // Get the TopiaContextImplementor TopiaContextImplementor topiaContext = (TopiaContextImplementor)map.get(TOPIA_CONTEXT); if (topiaContext == null) { String message = String.format(MISSING_PROPERTY, TOPIA_CONTEXT); - throw new TopiaRuntimeException(message); + throw new TopiaException(message); } // Delegate creation to the specific JPA implementation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -26,7 +26,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -88,7 +87,7 @@ findSingleResult(result, set); } catch (Exception e) { - throw new TopiaRuntimeException("Could not execute query", e); + throw new TopiaException("Could not execute query", e); } finally { ps.close(); } @@ -119,7 +118,7 @@ findMultipleResult(result, set); } catch (Exception e) { - throw new TopiaRuntimeException("Could not execute query", e); + throw new TopiaException("Could not execute query", e); } finally { ps.close(); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -36,7 +36,6 @@ import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -46,7 +45,6 @@ import java.lang.reflect.Array; import java.util.Arrays; -import java.util.Collection; import java.util.List; @@ -98,7 +96,7 @@ addImport(entityEnum, TopiaEntity.class); addImport(entityEnum, EntityOperatorStore.class); addImport(entityEnum, Arrays.class); - addImport(entityEnum, TopiaRuntimeException.class); + addImport(entityEnum, TopiaException.class); addImport(entityEnum, ArrayUtils.class); } else { @@ -107,7 +105,7 @@ ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName ); - addImport(daoHelper, TopiaRuntimeException.class); + addImport(daoHelper, TopiaException.class); addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, EntityOperatorStore.class); addImport(daoHelper, Arrays.class); @@ -475,7 +473,7 @@ try { implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); } catch (ClassNotFoundException e) { - throw new TopiaRuntimeException("could not find class " + implementationFQN, e); + throw new TopiaException("could not find class " + implementationFQN, e); } } return implementation; Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -39,8 +39,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.hbm2ddl.TableMetadata; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLWork; import org.nuiton.topia.framework.TopiaSpecificUtil; @@ -154,17 +152,13 @@ @Override public void receiveReplicatedEntity(TopiaContextImplementor context, Object entity) { - try { - EntityManager entityManager = context.getEntityManager(); - if (entityManager instanceof EntityManagerImpl) { - Session session = ((EntityManagerImpl) entityManager).getSession(); - session.replicate(entity, ReplicationMode.EXCEPTION); - } else { - throw new UnsupportedOperationException( - "Cannot find Hibernate session to receive replicated entity"); - } - } catch (TopiaException te) { - throw new TopiaRuntimeException("Unable to receive replicated entity", te); + EntityManager entityManager = context.getEntityManager(); + if (entityManager instanceof EntityManagerImpl) { + Session session = ((EntityManagerImpl) entityManager).getSession(); + session.replicate(entity, ReplicationMode.EXCEPTION); + } else { + throw new UnsupportedOperationException( + "Cannot find Hibernate session to receive replicated entity"); } } @@ -231,17 +225,13 @@ } }; - try { - EntityManager entityManager = context.getEntityManager(); - if (entityManager instanceof EntityManagerImpl) { - Session session = ((EntityManagerImpl) entityManager).getSession(); - session.doWork(hibernateWork); - } else { - throw new UnsupportedOperationException( - "Cannot find Hibernate session to run the SQL work"); - } - } catch (TopiaException te) { - throw new TopiaRuntimeException("Unable to run SQL work", te); + EntityManager entityManager = context.getEntityManager(); + if (entityManager instanceof EntityManagerImpl) { + Session session = ((EntityManagerImpl) entityManager).getSession(); + session.doWork(hibernateWork); + } else { + throw new UnsupportedOperationException( + "Cannot find Hibernate session to run the SQL work"); } } } 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 2012-05-29 15:05:59 UTC (rev 2552) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 15:40:37 UTC (rev 2553) @@ -31,7 +31,6 @@ import org.hibernate.cfg.Configuration; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextAdapter; import org.nuiton.topia.event.TopiaContextEvent; import org.nuiton.topia.event.TopiaContextListener; @@ -256,7 +255,7 @@ doMigrateSchema(); } catch (MigrationServiceException e) { - throw new TopiaRuntimeException("Can't migrate schema for reason " + e.getMessage(), e); + throw new TopiaException("Can't migrate schema for reason " + e.getMessage(), e); } } else { if (log.isDebugEnabled()) { @@ -279,7 +278,7 @@ if (log.isErrorEnabled()) { log.error(_("topia.migration.migration.incomplete")); } - throw new TopiaRuntimeException(_("topia.migration.migration.incomplete")); + throw new TopiaException(_("topia.migration.migration.incomplete")); } } @@ -429,67 +428,62 @@ log.debug("Detected version = " + dbVersion); } - try { + boolean createTable = !versionTableExist; + // update version even if database has not been migrated + // only case that database doesn't exist match this + if (createTable) { + // si la base n'etait pas versionnee, la table version n'existe pas + // creation + if (log.isDebugEnabled()) { + log.debug("Adding tms_version table"); + } - boolean createTable = !versionTableExist; - // update version even if database has not been migrated - // only case that database doesn't exist match this - if (createTable) { - // si la base n'etait pas versionnee, la table version n'existe pas - // creation - if (log.isDebugEnabled()) { - log.debug("Adding tms_version table"); - } + // creer le schema en base + // dans la configuration versionConfiguration, il n'y a que la table version + TMSVersionDAO.createTable(versionConfiguration); - // creer le schema en base - // dans la configuration versionConfiguration, il n'y a que la table version - TMSVersionDAO.createTable(versionConfiguration); - - if (log.isDebugEnabled()) { - log.debug("Table for " + TMSVersion.class.getSimpleName() + " created"); - } + if (log.isDebugEnabled()) { + log.debug("Table for " + TMSVersion.class.getSimpleName() + " created"); } + } - // Set new version in database - TopiaContext tx = rootContext.beginTransaction(); - try { + // Set new version in database + TopiaContext tx = rootContext.beginTransaction(); + try { - // delete all previous data in table - TMSVersionDAO.deleteAll(tx); + // delete all previous data in table + TMSVersionDAO.deleteAll(tx); - if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); - } + if (log.isInfoEnabled()) { + log.info(_("topia.migration.saving.db.version", version)); + } - // create new version and store it in table - TMSVersion tmsVersion = - TMSVersionDAO.create(tx, version.getVersion()); - if (log.isDebugEnabled()) { - log.debug("Created version : " + tmsVersion.getVersion()); - } + // create new version and store it in table + TMSVersion tmsVersion = + TMSVersionDAO.create(tx, version.getVersion()); + if (log.isDebugEnabled()) { + log.debug("Created version : " + tmsVersion.getVersion()); + } - tx.commitTransaction(); - } catch (TopiaException e) { - if (tx != null) { - tx.rollbackTransaction(); - } - throw e; - } finally { - if (tx != null) { - tx.closeContext(); - } + tx.commitTransaction(); + } catch (TopiaException e) { + if (tx != null) { + tx.rollbackTransaction(); } + throw e; + } finally { + if (tx != null) { + tx.closeContext(); + } + } - if (legacyVersionTableExist) { + if (legacyVersionTableExist) { - if (log.isDebugEnabled()) { - log.debug("Will drop legacy tmsVersion table"); - } - // on supprime l'ancienne table - TMSVersionDAO.dropTable(legacyVersionConfiguration); + if (log.isDebugEnabled()) { + log.debug("Will drop legacy tmsVersion table"); } - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + // on supprime l'ancienne table + TMSVersionDAO.dropTable(legacyVersionConfiguration); } // on change les etats internes du service @@ -592,18 +586,14 @@ // table does not exist, version is null return null; } + TopiaContext tx = rootContext.beginTransaction(); try { - TopiaContext tx = rootContext.beginTransaction(); - try { - Version v = TMSVersionDAO.getVersion(tx, tableName); - return v; - } finally { - if (tx != null) { - tx.closeContext(); - } + Version v = TMSVersionDAO.getVersion(tx, tableName); + return v; + } finally { + if (tx != null) { + tx.closeContext(); } - } catch (TopiaException e) { - throw new TopiaRuntimeException("Can't obtain dbVersion for reason " + e.getMessage(), e); } }

1 0

r2552 - in trunk/topia-service-security: . src/main/java/org/nuiton/topia src/main/java/org/nuiton/topia/taas/event src/main/xmi src/test/java/org/nuiton/topia/security
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 17:05:59 +0200 (Tue, 29 May 2012) New Revision: 2552 Url: http://nuiton.org/repositories/revision/topia/2552 Log: Remove obsolete model in topia-security-service Removed: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/ Modified: trunk/topia-service-security/pom.xml trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-05-29 14:25:11 UTC (rev 2551) +++ trunk/topia-service-security/pom.xml 2012-05-29 15:05:59 UTC (rev 2552) @@ -49,12 +49,12 @@ <version>${project.version}</version> </dependency> -  -  -  -  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence-tck</artifactId> + <version>${project.version}</version>  -  + </dependency> <dependency> <groupId>org.nuiton</groupId> Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java 2012-05-29 14:25:11 UTC (rev 2551) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java 2012-05-29 15:05:59 UTC (rev 2552) @@ -37,7 +37,7 @@ import java.util.List; -import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE; +import static org.nuiton.topia.taas.TaasUtil.UPDATE; import static org.nuiton.topia.taas.TaasUtil.CREATE; import static org.nuiton.topia.taas.TaasUtil.DELETE; import static org.nuiton.topia.taas.TaasUtil.LOAD; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java 2012-05-29 14:25:11 UTC (rev 2551) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java 2012-05-29 15:05:59 UTC (rev 2552) @@ -34,7 +34,7 @@ import java.util.List; -import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE; +import static org.nuiton.topia.taas.TaasUtil.UPDATE; import static org.nuiton.topia.taas.TaasUtil.CREATE; import static org.nuiton.topia.taas.TaasUtil.DELETE; import static org.nuiton.topia.taas.TaasUtil.LOAD; Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo =================================================================== (Binary files differ) Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-05-29 14:25:11 UTC (rev 2551) +++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2012-05-29 15:05:59 UTC (rev 2552) @@ -27,52 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.nuiton.i18n.I18n; -import org.nuiton.topia.TestHelper; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaSecurityDAOHelper; -import org.nuiton.topia.TopiaTestDAOHelper; -import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization; -import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO; -import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization; -import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationDAO; -import org.nuiton.topia.security.entities.authorization.TopiaExpressionLink; -import org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkDAO; -import org.nuiton.topia.security.entities.user.TopiaGroup; -import org.nuiton.topia.security.entities.user.TopiaGroupDAO; -import org.nuiton.topia.security.entities.user.TopiaUser; -import org.nuiton.topia.security.entities.user.TopiaUserDAO; -import org.nuiton.topia.security.jaas.TopiaCallbackHandler; -import org.nuiton.topia.security.util.TopiaSecurityFactoryFilter; -import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; -import org.nuiton.topia.test.entities.PersonImpl; -import org.nuiton.topia.test.entities.Pet; -import org.nuiton.topia.test.entities.PetDAO; -import org.nuiton.topia.test.entities.PetImpl; -import org.nuiton.topia.test.entities.RaceImpl; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; -import java.io.File; -import java.security.PrivilegedExceptionAction; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Properties; - -import static org.nuiton.topia.security.util.TopiaSecurityUtil.LOAD; -import static org.nuiton.topia.security.util.TopiaSecurityUtil.UPDATE; - /** * Tests unitaires. Ne pas oublier de lancer le script d'initialisation de la * base données. @@ -85,362 +41,379 @@ protected static TopiaContext context; - protected static TopiaSecurityService securityManager; - - protected static TopiaSecurityFactoryFilter factoryFilter; - // FIXME comment il trouve les autres tout seul ? - // The grande question !!! - - - protected static File tesDir; - - protected static String entitiesList = - PersonImpl.class.getName() + "," + - PetImpl.class.getName() + "," + - RaceImpl.class.getName(); - - @BeforeClass - public static void init() throws Exception { - I18n.init(null, Locale.FRANCE); - tesDir = TestHelper.getTestBasedir(TopiaSecurityTest.class); - - } - - @AfterClass - public static void clean() { - // tchemit 2010-11-28 : no never delete data after a test... -// TestUtils.clean(); - } - - @Ignore - protected Properties getProperties() { - Properties config = new Properties(); -// Properties config = TestHelper.initTopiaContextConfiguration(tesDir,"topia-security"); - - if (log.isDebugEnabled()) { - config.setProperty("hibernate.show_sql", "true"); - } - - config.setProperty("topia.persistence.classes", entitiesList); - - config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); - config.setProperty("hibernate.connection.username", "sa"); - config.setProperty("hibernate.connection.password", ""); - config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - - config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); - - // add this to use security service - config.setProperty("topia.service.security", "org.nuiton.topia.security.TopiaSecurityServiceImpl"); - return config; - } - - @Ignore - public void initDatabase() throws TopiaException { - - Properties config = getProperties(); - config.setProperty("hibernate.hbm2ddl.auto", "create"); - - /* Transaction */ - TopiaContext rootContext = TopiaContextFactory.getContext(config); - TopiaContext childContext = rootContext.beginTransaction(); - - /* DAOs */ - PersonDAO personDAO = TopiaTestDAOHelper.getPersonDAO(childContext); - PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); - - TopiaUserDAO topiaUserDAO = TopiaSecurityDAOHelper.getTopiaUserDAO(childContext); - TopiaGroupDAO topiaGroupDAO = TopiaSecurityDAOHelper.getTopiaGroupDAO(childContext); - TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaEntityAuthorizationDAO(childContext); - TopiaExpressionLinkDAO linkDAO = TopiaSecurityDAOHelper.getTopiaExpressionLinkDAO(childContext); - TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaAssociationAuthorizationDAO(childContext); - - /* Création d'un admin */ - TopiaUser admin = topiaUserDAO.create(); - admin.setLogin("admin"); - admin.setPassword("azerty"); - topiaUserDAO.update(admin); - childContext.commitTransaction(); - - /* Création d'un utilisateur */ - TopiaUser thimel = topiaUserDAO.create(); - thimel.setLogin("thimel"); - thimel.setPassword("zou;bi@da"); - topiaUserDAO.update(thimel); - childContext.commitTransaction(); - - /* Création d'un groupe avec un utilisateur */ - TopiaUser ruchaud = topiaUserDAO.create(); - ruchaud.setLogin("ruchaud"); - ruchaud.setPassword("mdp"); - TopiaGroup groupRuchaud = topiaGroupDAO.create(); - groupRuchaud.setName("essai"); - - groupRuchaud.setTopiaUser(new ArrayList<TopiaUser>()); - ruchaud.addTopiaGroup(groupRuchaud); - - topiaGroupDAO.update(groupRuchaud); - topiaUserDAO.update(ruchaud); - childContext.commitTransaction(); - - /* Création des personnes */ - Person benjamin = personDAO.create(); - benjamin.setName("poussin"); - benjamin.setFirstname("benjamin"); - personDAO.update(benjamin); - childContext.commitTransaction(); - - Person jacques = personDAO.create(); - jacques.setName("poussin"); - jacques.setFirstname("jacques"); - personDAO.update(jacques); - childContext.commitTransaction(); - - Person mylene = personDAO.create(); - mylene.setName("poussin"); - mylene.setFirstname("mylene"); - personDAO.update(mylene); - childContext.commitTransaction(); - - /* Création des annimaux */ - Pet debux = petDAO.create(); - debux.setName("debux"); - debux.setType("chat"); - debux.setPerson(jacques); - petDAO.update(debux); - childContext.commitTransaction(); - - Pet pluto = petDAO.create(); - pluto.setName("pluto"); - pluto.setType("chien"); - pluto.setPerson(jacques); - petDAO.update(pluto); - childContext.commitTransaction(); - - Pet fliper = petDAO.create(); - fliper.setName("fliper"); - fliper.setType("dauphin"); - fliper.setPerson(mylene); - petDAO.update(fliper); - childContext.commitTransaction(); - - /* Création des autorisations Entity */ - TopiaEntityAuthorization authorizationForAdmin = topiaEntityAuthorizationDAO.create(); - authorizationForAdmin.setExpression("*"); - authorizationForAdmin.setActions(15); - authorizationForAdmin.setPrincipals(admin.getTopiaId()); - topiaEntityAuthorizationDAO.update(authorizationForAdmin); - childContext.commitTransaction(); - - TopiaEntityAuthorization authorizationForRuchaud = topiaEntityAuthorizationDAO.create(); - authorizationForRuchaud.setExpression(Person.class.getName() + "#*"); - authorizationForRuchaud.setActions(LOAD); - authorizationForRuchaud.setPrincipals(groupRuchaud.getTopiaId()); - topiaEntityAuthorizationDAO.update(authorizationForRuchaud); - childContext.commitTransaction(); - - TopiaEntityAuthorization authorizationForThimel = topiaEntityAuthorizationDAO.create(); - authorizationForThimel.setExpression(jacques.getTopiaId()); - authorizationForThimel.setActions(LOAD); - authorizationForThimel.setPrincipals(thimel.getTopiaId()); - topiaEntityAuthorizationDAO.update(authorizationForThimel); - childContext.commitTransaction(); - - /* Création d'une autorisation Link */ - TopiaExpressionLink link = linkDAO.create(); - link.setReplace(mylene.getTopiaId()); - link.setBy(jacques.getTopiaId()); - linkDAO.update(link); - childContext.commitTransaction(); - - /* Création d'une authorisation association */ - TopiaAssociationAuthorization associationAuthorization = topiaAssociationAuthorizationDAO.create(); - associationAuthorization.setIdBeginAssociation(jacques.getTopiaId()); - associationAuthorization.setNameAssociation("pet"); - associationAuthorization.setActions(LOAD); - associationAuthorization.setPrincipals(ruchaud.getTopiaId()); - topiaAssociationAuthorizationDAO.update(associationAuthorization); - childContext.commitTransaction(); - - associationAuthorization = topiaAssociationAuthorizationDAO.create(); - associationAuthorization.setIdBeginAssociation(mylene.getTopiaId()); - associationAuthorization.setNameAssociation("pet"); - associationAuthorization.setActions(UPDATE); - associationAuthorization.setPrincipals(ruchaud.getTopiaId()); - topiaAssociationAuthorizationDAO.update(associationAuthorization); - childContext.commitTransaction(); - - childContext.closeContext(); - } - - @Before - public void setUp() throws TopiaException { - initDatabase(); - context = TopiaContextFactory.getContext(getProperties()); - securityManager = context.getService(TopiaSecurityService.class); - factoryFilter = new TopiaSecurityFactoryFilter(securityManager); - } - - @After - public void tearDown() throws TopiaException { - if (context != null) { - context.closeContext(); - } - } - - @Test - public void testLoginThimel() throws Exception { - /* Authentification de l'utilisateur Thimel */ - LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( - "thimel", "zou;bi@da")); - loginContext.login(); - Subject subject = loginContext.getSubject(); - - /* Test */ - Assert.assertEquals(subject.getPrincipals().size(), 1); - - loginContext.logout(); - } - - @Test - public void testLoginRuchaud() throws Exception { - /* Authentification de l'utilisateur Ruchaud */ - LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( - "ruchaud", "mdp")); - loginContext.login(); - Subject subject = loginContext.getSubject(); - - /* Test */ - Assert.assertEquals(subject.getPrincipals().size(), 2); - - loginContext.logout(); - } - - @Test - public void testAuthorizationThimel() throws Exception { - /* Authentification de l'utilisateur Thimel */ - LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( - "thimel", "zou;bi@da")); - loginContext.login(); - Subject subject = loginContext.getSubject(); - - /* Tests */ - Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { - - @Override - public Object run() throws Exception { - TopiaContext childContext = context.beginTransaction(); - - /* Personnes */ - PersonDAO personDAO = TopiaTestDAOHelper.getPersonDAO(childContext); - List<Person> findAllPerson = personDAO.findAll(); - - List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - Assert.assertEquals(2, personsLOAD.size()); - - List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - Assert.assertEquals(0, personsUPDATE.size()); - - /* Annimaux */ - PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); - List<Pet> findAllPet = petDAO.findAll(); - - List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - Assert.assertEquals(0, petLOAD.size()); - - List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - Assert.assertEquals(0, petUPDATE.size()); - return null; - } - }, null); - - loginContext.logout(); - } - - @Test - public void testAuthorizationRuchaud() throws Exception { - /* Authentification de l'utilisateur Admin */ - LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( - "ruchaud", "mdp")); - loginContext.login(); - Subject subject = loginContext.getSubject(); - - /* Tests */ - Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { - - @Override - public Object run() throws Exception { - TopiaContext childContext = context.beginTransaction(); - - /* Personnes */ - PersonDAO personDAO = TopiaTestDAOHelper.getPersonDAO(childContext); - List<Person> findAllPerson = personDAO.findAll(); - - List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(12, personsLOAD.size()); - - List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - Assert.assertEquals(0, personsUPDATE.size()); - - /* Annimaux */ - PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); - List<Pet> findAllPet = petDAO.findAll(); - - List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - Assert.assertEquals(2, petLOAD.size()); - - List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - Assert.assertEquals(1, petUPDATE.size()); - return null; - } - }, null); - - loginContext.logout(); - } - - @Test - public void testAuthorizationAdmin() throws Exception { - /* Authentification de l'utilisateur Ruchaud */ - LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( - "admin", "azerty")); - loginContext.login(); - Subject subject = loginContext.getSubject(); - - /* Tests */ - Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { - - @Override - public Object run() throws Exception { - TopiaContext childContext = context.beginTransaction(); - - /* Personnes */ - PersonDAO personDAO = TopiaTestDAOHelper.getPersonDAO(childContext); - List<Person> findAllPerson = personDAO.findAll(); - - List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - //Assert.assertEquals(3, personsLOAD.size()); - Assert.assertEquals(15, personsLOAD.size()); - - List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - //Assert.assertEquals(3, personsUPDATE.size()); - Assert.assertEquals(15, personsUPDATE.size()); - - /* Annimaux */ - PetDAO petDAO = TopiaTestDAOHelper.getPetDAO(childContext); - List<Pet> findAllPet = petDAO.findAll(); - - List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - //Assert.assertEquals(3, petLOAD.size()); - Assert.assertEquals(15, petLOAD.size()); - - List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - //Assert.assertEquals(3, petUPDATE.size()); - Assert.assertEquals(15, petUPDATE.size()); - return null; - } - }, null); - - loginContext.logout(); - } +// protected static TopiaSecurityService securityManager; +// +// protected static TopiaSecurityFactoryFilter factoryFilter; +// // FIXME comment il trouve les autres tout seul ? +// // The grande question !!! +// +// +// protected static File tesDir; +// +// protected static String entitiesList = +// PersonImpl.class.getName() + "," + +// PetImpl.class.getName() + "," + +// RaceImpl.class.getName(); +// +// @BeforeClass +// public static void init() throws Exception { +// I18n.init(null, Locale.FRANCE); +// +// // Trying to look for the temporary folder to store data for the test +// String tempDirPath = System.getProperty("java.io.tmpdir"); +// if (tempDirPath == null) { +// // can this really occur ? +// tempDirPath = ""; +// if (log.isWarnEnabled()) { +// log.warn("'\"java.io.tmpdir\" not defined"); +// } +// } +// File tempDirFile = new File(tempDirPath); +// +// // create the directory to store database data +// String dataBasePath = TopiaSecurityTest.class.getName() +// + File.separator; // a directory with the test class name +// +// dataBasePath += '_' + String.valueOf(System.nanoTime()); +// tesDir = new File(tempDirFile, dataBasePath); +// +// } +// +// @AfterClass +// public static void clean() { +// // tchemit 2010-11-28 : no never delete data after a test... +//// TestUtils.clean(); +// } +// +// @Ignore +// protected Properties getProperties() { +// Properties config = new Properties(); +//// Properties config = TestHelper.initTopiaContextConfiguration(tesDir,"topia-security"); +// +// if (log.isDebugEnabled()) { +// config.setProperty("hibernate.show_sql", "true"); +// } +// +// config.setProperty("topia.persistence.classes", entitiesList); +// +// config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); +// config.setProperty("hibernate.connection.username", "sa"); +// config.setProperty("hibernate.connection.password", ""); +// config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); +// +// config.setProperty("hibernate.connection.url", "jdbc:h2:" + new File(tesDir, "topia-security")); +// +// // add this to use security service +// config.setProperty("topia.service.security", "org.nuiton.topia.security.TopiaSecurityServiceImpl"); +// return config; +// } +// +// @Ignore +// public void initDatabase() throws TopiaException { +// +// Properties config = getProperties(); +// config.setProperty("hibernate.hbm2ddl.auto", "create"); +// +// /* Transaction */ +// TopiaContext rootContext = TopiaContextFactory.getContext(config); +// TopiaContext childContext = rootContext.beginTransaction(); +// +// /* DAOs */ +// PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(childContext); +// PetDAO petDAO = TopiaTckLegacyDAOHelper.getPetDAO(childContext); +// +// TopiaUserDAO topiaUserDAO = TopiaSecurityDAOHelper.getTopiaUserDAO(childContext); +// TopiaGroupDAO topiaGroupDAO = TopiaSecurityDAOHelper.getTopiaGroupDAO(childContext); +// TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaEntityAuthorizationDAO(childContext); +// TopiaExpressionLinkDAO linkDAO = TopiaSecurityDAOHelper.getTopiaExpressionLinkDAO(childContext); +// TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaSecurityDAOHelper.getTopiaAssociationAuthorizationDAO(childContext); +// +// /* Création d'un admin */ +// TopiaUser admin = topiaUserDAO.create(); +// admin.setLogin("admin"); +// admin.setPassword("azerty"); +// topiaUserDAO.update(admin); +// childContext.commitTransaction(); +// +// /* Création d'un utilisateur */ +// TopiaUser thimel = topiaUserDAO.create(); +// thimel.setLogin("thimel"); +// thimel.setPassword("zou;bi@da"); +// topiaUserDAO.update(thimel); +// childContext.commitTransaction(); +// +// /* Création d'un groupe avec un utilisateur */ +// TopiaUser ruchaud = topiaUserDAO.create(); +// ruchaud.setLogin("ruchaud"); +// ruchaud.setPassword("mdp"); +// TopiaGroup groupRuchaud = topiaGroupDAO.create(); +// groupRuchaud.setName("essai"); +// +// groupRuchaud.setTopiaUser(new ArrayList<TopiaUser>()); +// ruchaud.addTopiaGroup(groupRuchaud); +// +// topiaGroupDAO.update(groupRuchaud); +// topiaUserDAO.update(ruchaud); +// childContext.commitTransaction(); +// +// /* Création des personnes */ +// Person benjamin = personDAO.create(); +// benjamin.setName("poussin"); +// benjamin.setFirstname("benjamin"); +// personDAO.update(benjamin); +// childContext.commitTransaction(); +// +// Person jacques = personDAO.create(); +// jacques.setName("poussin"); +// jacques.setFirstname("jacques"); +// personDAO.update(jacques); +// childContext.commitTransaction(); +// +// Person mylene = personDAO.create(); +// mylene.setName("poussin"); +// mylene.setFirstname("mylene"); +// personDAO.update(mylene); +// childContext.commitTransaction(); +// +// /* Création des annimaux */ +// Pet debux = petDAO.create(); +// debux.setName("debux"); +// debux.setType("chat"); +// debux.setPerson(jacques); +// petDAO.update(debux); +// childContext.commitTransaction(); +// +// Pet pluto = petDAO.create(); +// pluto.setName("pluto"); +// pluto.setType("chien"); +// pluto.setPerson(jacques); +// petDAO.update(pluto); +// childContext.commitTransaction(); +// +// Pet fliper = petDAO.create(); +// fliper.setName("fliper"); +// fliper.setType("dauphin"); +// fliper.setPerson(mylene); +// petDAO.update(fliper); +// childContext.commitTransaction(); +// +// /* Création des autorisations Entity */ +// TopiaEntityAuthorization authorizationForAdmin = topiaEntityAuthorizationDAO.create(); +// authorizationForAdmin.setExpression("*"); +// authorizationForAdmin.setActions(15); +// authorizationForAdmin.setPrincipals(admin.getTopiaId()); +// topiaEntityAuthorizationDAO.update(authorizationForAdmin); +// childContext.commitTransaction(); +// +// TopiaEntityAuthorization authorizationForRuchaud = topiaEntityAuthorizationDAO.create(); +// authorizationForRuchaud.setExpression(Person.class.getName() + "#*"); +// authorizationForRuchaud.setActions(LOAD); +// authorizationForRuchaud.setPrincipals(groupRuchaud.getTopiaId()); +// topiaEntityAuthorizationDAO.update(authorizationForRuchaud); +// childContext.commitTransaction(); +// +// TopiaEntityAuthorization authorizationForThimel = topiaEntityAuthorizationDAO.create(); +// authorizationForThimel.setExpression(jacques.getTopiaId()); +// authorizationForThimel.setActions(LOAD); +// authorizationForThimel.setPrincipals(thimel.getTopiaId()); +// topiaEntityAuthorizationDAO.update(authorizationForThimel); +// childContext.commitTransaction(); +// +// /* Création d'une autorisation Link */ +// TopiaExpressionLink link = linkDAO.create(); +// link.setReplace(mylene.getTopiaId()); +// link.setBy(jacques.getTopiaId()); +// linkDAO.update(link); +// childContext.commitTransaction(); +// +// /* Création d'une authorisation association */ +// TopiaAssociationAuthorization associationAuthorization = topiaAssociationAuthorizationDAO.create(); +// associationAuthorization.setIdBeginAssociation(jacques.getTopiaId()); +// associationAuthorization.setNameAssociation("pet"); +// associationAuthorization.setActions(LOAD); +// associationAuthorization.setPrincipals(ruchaud.getTopiaId()); +// topiaAssociationAuthorizationDAO.update(associationAuthorization); +// childContext.commitTransaction(); +// +// associationAuthorization = topiaAssociationAuthorizationDAO.create(); +// associationAuthorization.setIdBeginAssociation(mylene.getTopiaId()); +// associationAuthorization.setNameAssociation("pet"); +// associationAuthorization.setActions(UPDATE); +// associationAuthorization.setPrincipals(ruchaud.getTopiaId()); +// topiaAssociationAuthorizationDAO.update(associationAuthorization); +// childContext.commitTransaction(); +// +// childContext.closeContext(); +// } +// +// @Before +// public void setUp() throws TopiaException { +// initDatabase(); +// context = TopiaContextFactory.getContext(getProperties()); +// securityManager = context.getService(TopiaSecurityService.class); +// factoryFilter = new TopiaSecurityFactoryFilter(securityManager); +// } +// +// @After +// public void tearDown() throws TopiaException { +// if (context != null) { +// context.closeContext(); +// } +// } +// +// @Test +// public void testLoginThimel() throws Exception { +// /* Authentification de l'utilisateur Thimel */ +// LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( +// "thimel", "zou;bi@da")); +// loginContext.login(); +// Subject subject = loginContext.getSubject(); +// +// /* Test */ +// Assert.assertEquals(subject.getPrincipals().size(), 1); +// +// loginContext.logout(); +// } +// +// @Test +// public void testLoginRuchaud() throws Exception { +// /* Authentification de l'utilisateur Ruchaud */ +// LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( +// "ruchaud", "mdp")); +// loginContext.login(); +// Subject subject = loginContext.getSubject(); +// +// /* Test */ +// Assert.assertEquals(subject.getPrincipals().size(), 2); +// +// loginContext.logout(); +// } +// +// @Test +// public void testAuthorizationThimel() throws Exception { +// /* Authentification de l'utilisateur Thimel */ +// LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( +// "thimel", "zou;bi@da")); +// loginContext.login(); +// Subject subject = loginContext.getSubject(); +// +// /* Tests */ +// Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { +// +// @Override +// public Object run() throws Exception { +// TopiaContext childContext = context.beginTransaction(); +// +// /* Personnes */ +// PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(childContext); +// List<Person> findAllPerson = personDAO.findAll(); +// +// List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); +// Assert.assertEquals(2, personsLOAD.size()); +// +// List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); +// Assert.assertEquals(0, personsUPDATE.size()); +// +// /* Annimaux */ +// PetDAO petDAO = TopiaTckLegacyDAOHelper.getPetDAO(childContext); +// List<Pet> findAllPet = petDAO.findAll(); +// +// List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); +// Assert.assertEquals(0, petLOAD.size()); +// +// List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); +// Assert.assertEquals(0, petUPDATE.size()); +// return null; +// } +// }, null); +// +// loginContext.logout(); +// } +// +// @Test +// public void testAuthorizationRuchaud() throws Exception { +// /* Authentification de l'utilisateur Admin */ +// LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( +// "ruchaud", "mdp")); +// loginContext.login(); +// Subject subject = loginContext.getSubject(); +// +// /* Tests */ +// Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { +// +// @Override +// public Object run() throws Exception { +// TopiaContext childContext = context.beginTransaction(); +// +// /* Personnes */ +// PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(childContext); +// List<Person> findAllPerson = personDAO.findAll(); +// +// List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); +// //Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(12, personsLOAD.size()); +// +// List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); +// Assert.assertEquals(0, personsUPDATE.size()); +// +// /* Annimaux */ +// PetDAO petDAO = TopiaTckLegacyDAOHelper.getPetDAO(childContext); +// List<Pet> findAllPet = petDAO.findAll(); +// +// List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); +// Assert.assertEquals(2, petLOAD.size()); +// +// List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); +// Assert.assertEquals(1, petUPDATE.size()); +// return null; +// } +// }, null); +// +// loginContext.logout(); +// } +// +// @Test +// public void testAuthorizationAdmin() throws Exception { +// /* Authentification de l'utilisateur Ruchaud */ +// LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( +// "admin", "azerty")); +// loginContext.login(); +// Subject subject = loginContext.getSubject(); +// +// /* Tests */ +// Subject.doAsPrivileged(subject, new PrivilegedExceptionAction<Object>() { +// +// @Override +// public Object run() throws Exception { +// TopiaContext childContext = context.beginTransaction(); +// +// /* Personnes */ +// PersonDAO personDAO = TopiaTckLegacyDAOHelper.getPersonDAO(childContext); +// List<Person> findAllPerson = personDAO.findAll(); +// +// List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); +// //Assert.assertEquals(3, personsLOAD.size()); +// Assert.assertEquals(15, personsLOAD.size()); +// +// List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); +// //Assert.assertEquals(3, personsUPDATE.size()); +// Assert.assertEquals(15, personsUPDATE.size()); +// +// /* Annimaux */ +// PetDAO petDAO = TopiaTckLegacyDAOHelper.getPetDAO(childContext); +// List<Pet> findAllPet = petDAO.findAll(); +// +// List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); +// //Assert.assertEquals(3, petLOAD.size()); +// Assert.assertEquals(15, petLOAD.size()); +// +// List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); +// //Assert.assertEquals(3, petUPDATE.size()); +// Assert.assertEquals(15, petUPDATE.size()); +// return null; +// } +// }, null); +// +// loginContext.logout(); +// } }

1 0

r2551 - trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework
by athimel＠users.nuiton.org 29 May '12

29 May '12

Author: athimel Date: 2012-05-29 16:25:11 +0200 (Tue, 29 May 2012) New Revision: 2551 Url: http://nuiton.org/repositories/revision/topia/2551 Log: Fix comment Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-29 14:24:51 UTC (rev 2550) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-29 14:25:11 UTC (rev 2551) @@ -104,8 +104,8 @@ TopiaContext rootContext = db.getRootCtxt(); // XXX AThimel 10/05/2012 This cannot be done with ToPIA 3 because of - // independence regarding to the JPA implem, which changes the way - // EntityManager is created + // XXX independence regarding to the JPA implem, which changes the way + // XXX EntityManager is created // boolean actual = rootContext.isSchemaExist(PersonImpl.class); boolean actual = false; assertFalse(actual);

1 0