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

r1753 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: fdesbois Date: 2010-01-07 11:37:20 +0100 (Thu, 07 Jan 2010) New Revision: 1753 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Add managment for select with more than one properties 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 2010-01-07 03:29:06 UTC (rev 1752) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 10:37:20 UTC (rev 1753) @@ -262,62 +262,72 @@ } } - /** - * Constructor of TopiaQuery with entityClass initialization. - * - * @param entityClass Class for an entity Query - */ protected TopiaQuery(Class<E> entityClass) { parentheses = true; mainEntityClass = entityClass; this.from = " FROM " + mainEntityClass.getName(); } - /** - * Constructor of TopiaQuery from a DAO - * - * @param dao DAO linked to the entity to threat - */ protected TopiaQuery(TopiaDAO<E> dao) { this(dao.getEntityClass()); this.dao = dao; } - /** - * Constructor of TopiaQuery with String form initialization. - * - * @param entityClass - * @param alias of the main entity in the query - */ protected TopiaQuery(Class<E> entityClass, String alias) { this(entityClass); this.mainAlias = alias; this.from += " " + alias; } - /** - * Constructor of TopiaQuery from a DAO with an Alias - * - * @param dao DAO linked to the entity to threat - * @param alias of the main entity in the query - */ protected TopiaQuery(TopiaDAO<E> dao, String alias) { this(dao.getEntityClass(), alias); this.dao = dao; } + /** + * Create a TopiaQuery with entityClass initialization. + * + * @param <T> entity type extends TopiaEntity + * @param entityClass Class for an entity Query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(Class<T> entityClass) { return new TopiaQuery<T>(entityClass); } + /** + * Create a TopiaQuery from a DAO. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param dao DAO linked to the entity to threat + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(TopiaDAO<T> dao) { return new TopiaQuery<T>(dao); } + /** + * Create a TopiaQuery with entityClass initialization and its Alias. The main entity will be automatically added to the select part of + * the query if it is needed. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param entityClass Class for an entity Query + * @param alias of the main entity in the query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(Class<T> entityClass, String alias) { return new TopiaQuery<T>(entityClass, alias); } + /** + * Create a TopiaQuery from a DAO with an Alias. The main entity will be automatically added to the select part of + * the query if it is needed. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param dao DAO linked to the entity to threat + * @param alias of the main entity in the query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(TopiaDAO<T> dao, String alias) { return new TopiaQuery<T>(dao, alias); } @@ -554,18 +564,38 @@ } /** - * Set the select in the query. Depends on the result wanted in execute methods. + * Add an element to the select in the query. Depends on the result wanted in execute methods. The main entity will be + * automatically added only if an alias is initialize from constructor. If you want only this select element, use {@link #setSelect(java.lang.String) } + * method instead. * * @param select element to add * @return the TopiaQuery */ + public TopiaQuery<E> addSelect(String select) { + // if select is the mainAlias, do nothing + if (mainAlias != null && select.equals(mainAlias)) { + return this; + } + // if select is not null, add the new element to the select + if (this.select != null) { + this.select += ", "; + // if mainAlias is not null, add it before adding the select in argument + } else if (mainAlias != null) { + this.select = mainAlias + ", "; + } else { + this.select = ""; + } + this.select += select; + return this; + } + + /** + * Set the select in the query. Depends on the result wanted in execute methods. + * + * @param select element to set + * @return the TopiaQuery + */ public TopiaQuery<E> setSelect(String select) { -// if (this.select == null) { -// this.select = "SELECT "; -// } else { -// this.select += ", "; -// } -// this.select += select; this.select = select; return this; } @@ -687,14 +717,29 @@ } List<E> results = new ArrayList<E>(); for (Object o : res) { - if (o != null && !mainEntityClass.isAssignableFrom(o.getClass())) { - throw new ClassCastException("Invalid cast for " + mainEntityClass.getName()); + // FIXME-FD20090106 How to change this try/catch by a better solution to test if the object is an array +// try { +// Object[] tab = (Object[])o; +// // If it's an array, we want only the first element wich is the entity wanted +// o = tab[0]; +// } catch (ClassCastException eee) { +// // no need to do something here, the cast is to test if the Object is an array +// } + if (o instanceof Object[]) { + // If it's an array, we want only the first element wich is the entity wanted + o = ((Object[])o)[0]; } + if (!mainEntityClass.isAssignableFrom(o.getClass())) { + throw new ClassCastException(o.getClass().getName() + " can't be cast to " + mainEntityClass.getName() + " o : " + o); + } E entity = (E)o; - if (!getPropertiesToLoad().isEmpty()) { - loadProperties(entity); + // Check distinct constraint for complex query where o is firstly an Object[] (potentially distinct results with existing entity to add) + if (! (distinct && results.contains(entity)) ) { + if (!getPropertiesToLoad().isEmpty()) { + loadProperties(entity); + } + results.add(entity); } - results.add(entity); } return results; } @@ -732,7 +777,7 @@ for (E elmt : executeToEntityList(transaction)) { Object value = loadProperty(elmt, keyName); if (value != null && !keyClass.isAssignableFrom(value.getClass())) { - throw new ClassCastException("Invalid cast for " + keyClass.getName()); + throw new ClassCastException(value.getClass().getName() + " can't be cast to " + keyClass.getName()); } results.put((K)value, elmt); }

1 0

r1752 - trunk
by tchemit＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: tchemit Date: 2010-01-07 04:29:06 +0100 (Thu, 07 Jan 2010) New Revision: 1752 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) +++ trunk/pom.xml 2010-01-07 03:29:06 UTC (rev 1752) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent> <artifactId>topia</artifactId>

1 0

r1751 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:48:49 +0100 (Wed, 06 Jan 2010) New Revision: 1751 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -360,9 +360,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-3</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-persistence/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-service-history/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-service-index/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-service-migration/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-service-replication/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-service-security/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-01-06 15:48:43 UTC (rev 1750) +++ trunk/topia-soa/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3</version> + <version>2.3.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1750 - in tags: . topia-2.3.0-beta-3
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:48:43 +0100 (Wed, 06 Jan 2010) New Revision: 1750 Added: tags/topia-2.3.0-beta-3/ Log: [maven-scm] copy for tag topia-2.3.0-beta-3 Property changes on: tags/topia-2.3.0-beta-3 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r1749 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:48:40 +0100 (Wed, 06 Jan 2010) New Revision: 1749 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Log: [maven-release-plugin] prepare release topia-2.3.0-beta-3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> <modules> <module>topia-persistence</module> @@ -360,9 +360,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.0-beta-3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.0-beta-3</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-persistence/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-service-history/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-service-index/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-service-migration/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-service-replication/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-service-security/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-01-06 15:42:04 UTC (rev 1748) +++ trunk/topia-soa/pom.xml 2010-01-06 15:48:40 UTC (rev 1749) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-3-SNAPSHOT</version> + <version>2.3.0-beta-3</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1748 - in trunk: topia-service-history/src/main/resources/oldmappings/TopiaHistory topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1 topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history topia
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:42:04 +0100 (Wed, 06 Jan 2010) New Revision: 1748 Added: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml Modified: trunk/topia-service-history/src/main/xmi/TopiaHistory.zargo trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo Log: change model version to 1.1 (change mapping from #177) Added: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml =================================================================== --- trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml (rev 0) +++ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.history.entities"> + <class name="org.nuiton.topia.history.entities.HistoryImpl" table="history" node="org.nuiton.topia.history.entities.HistoryImpl" abstract="false" proxy="org.nuiton.topia.history.entities.History" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/> + <property name="userId" type="text" access="field" column="userId" node="userId"/> + <property name="action" type="int" access="field" column="action" node="action"/> + <property name="type" type="text" access="field" column="type" node="type"/> + <property name="target" type="text" access="field" column="target" node="target"/> + </class> +</hibernate-mapping> Modified: trunk/topia-service-history/src/main/xmi/TopiaHistory.zargo =================================================================== (Binary files differ) Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization" > +  + <property name="idBeginAssociation" type="text" access="field" column="idBeginAssociation" node="idBeginAssociation"/> + <property name="nameAssociation" type="text" access="field" column="nameAssociation" node="nameAssociation"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization" > +  + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="replace" type="text" access="field" column="replace" node="replace"/> + <property name="by" type="text" access="field" column="by" node="by"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> + <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="description" type="text" access="field" column="description" node="description"/> + <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true"> + <key column="topiaGroup"/> + <many-to-many class="org.nuiton.topia.security.entities.user.TopiaUserImpl" column="topiaUser" node="topiaId"/> + </bag> + <many-to-one name="superGroup" class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="superGroup" node="superGroup/@topiaId" embed-xml="false"/> + <bag name="subGroup" inverse="true" lazy="true" node="subGroup" embed-xml="false"> + <key column="superGroup"/> + <one-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> + <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="note" type="text" access="field" column="note" node="note"/> + <property name="linkApplication" type="text" access="field" column="linkApplication" node="linkApplication"/> + <bag name="topiaGroup" table="topiagroup_topiauser" inverse="true" lazy="true" node="topiaGroup" embed-xml="true"> + <key column="topiaUser"/> + <many-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="topiaGroup" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true"> + <key column="principals"/> + <many-to-many class="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" column="authorizations" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="enabled" type="boolean" access="field" column="enabled" node="enabled"/> + <property name="lastConnectionDate" type="java.util.Date" access="field" column="lastConnectionDate" node="lastConnectionDate"/> + <property name="numberOfConnection" type="int" access="field" column="numberOfConnection" node="numberOfConnection"/> + <property name="link" type="text" access="field" column="link" node="link"/> + <bag name="principals" table="principals_users" lazy="true" node="principals" embed-xml="true"> + <key column="users"/> + <many-to-many class="org.nuiton.topia.taas.entities.TaasPrincipalImpl" column="principals" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo =================================================================== (Binary files differ)

1 0

r1747 - in trunk: topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:38:11 +0100 (Wed, 06 Jan 2010) New Revision: 1747 Modified: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml Log: revert from previous version mappings Modified: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml =================================================================== --- trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.history.entities.HistoryImpl" table="history" node="org.nuiton.topia.history.entities.HistoryImpl" abstract="false" proxy="org.nuiton.topia.history.entities.History" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/> <property name="userId" type="text" access="field" column="userId" node="userId"/> <property name="action" type="int" access="field" column="action" node="action"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,6 +4,6 @@ <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> </class> </hibernate-mapping> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="replace" type="text" access="field" column="replace" node="replace"/> <property name="by" type="text" access="field" column="by" node="by"/> </class> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="description" type="text" access="field" column="description" node="description"/> <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true"> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="login" type="text" access="field" column="login" node="login"/> <property name="email" type="text" access="field" column="email" node="email"/> <property name="password" type="text" access="field" column="password" node="password"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="expression" type="text" access="field" column="expression" node="expression"/> <property name="actions" type="int" access="field" column="actions" node="actions"/> </class> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true"> <key column="principals"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 15:38:11 UTC (rev 1747) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="login" type="text" access="field" column="login" node="login"/> <property name="password" type="text" access="field" column="password" node="password"/> <property name="email" type="text" access="field" column="email" node="email"/>

1 0

r1746 - in trunk: topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 16:14:46 +0100 (Wed, 06 Jan 2010) New Revision: 1746 Modified: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml Log: Update mapping for services (change from #177) Modified: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml =================================================================== --- trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.history.entities.HistoryImpl" table="history" node="org.nuiton.topia.history.entities.HistoryImpl" abstract="false" proxy="org.nuiton.topia.history.entities.History" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/> <property name="userId" type="text" access="field" column="userId" node="userId"/> <property name="action" type="int" access="field" column="action" node="action"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,6 +4,6 @@ <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> </class> </hibernate-mapping> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="replace" type="text" access="field" column="replace" node="replace"/> <property name="by" type="text" access="field" column="by" node="by"/> </class> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="description" type="text" access="field" column="description" node="description"/> <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true"> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="login" type="text" access="field" column="login" node="login"/> <property name="email" type="text" access="field" column="email" node="email"/> <property name="password" type="text" access="field" column="password" node="password"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="expression" type="text" access="field" column="expression" node="expression"/> <property name="actions" type="int" access="field" column="actions" node="actions"/> </class> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true"> <key column="principals"/> Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 08:54:51 UTC (rev 1745) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 15:14:46 UTC (rev 1746) @@ -4,7 +4,7 @@ <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> <property name="login" type="text" access="field" column="login" node="login"/> <property name="password" type="text" access="field" column="password" node="password"/> <property name="email" type="text" access="field" column="email" node="email"/>

1 0

r1745 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework persistence
by fdesbois＠users.nuiton.org 06 Jan '10

06 Jan '10

Author: fdesbois Date: 2010-01-06 09:54:51 +0100 (Wed, 06 Jan 2010) New Revision: 1745 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Log: - WARN : change TopiaQuery method addSelect by setSelect - Add methods to easily have multiple values for one parameter (IN clause) - Add distinct 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 2010-01-05 09:49:58 UTC (rev 1744) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-06 08:54:51 UTC (rev 1745) @@ -197,6 +197,8 @@ /** Select part of the query **/ protected String select; + protected boolean distinct; + /** From part of the query **/ protected String from; @@ -220,6 +222,8 @@ protected Class<E> mainEntityClass; + protected String mainAlias; + protected TopiaDAO<E> dao; /** @@ -287,6 +291,7 @@ */ protected TopiaQuery(Class<E> entityClass, String alias) { this(entityClass); + this.mainAlias = alias; this.from += " " + alias; } @@ -329,8 +334,13 @@ */ public String fullQuery() { String result = ""; + String selectKeyWord = "SELECT "; + selectKeyWord += distinct ? " DISTINCT " : ""; if (select != null) { - result = select; + result = selectKeyWord + select; + // Set default select if there is more than one table in from part and main alias is defined + } else if (from.contains(",") && !StringUtils.isEmpty(mainAlias)) { + result = selectKeyWord + mainAlias; } result += from; if (where != null) { @@ -400,6 +410,9 @@ * @return the TopiaQuery */ public TopiaQuery<E> add(String where) { + if (StringUtils.isEmpty(where)) { + return this; + } if (this.where == null) { this.where = " WHERE "; } else { @@ -426,13 +439,18 @@ * @return the TopiaQuery */ public TopiaQuery<E> add(String paramName, Op constraint, Object paramValue) { + String valueName = getValueName(paramName); + parentheses = false; + return add(paramName + " " + constraint + " :" + valueName).addParam(valueName, paramValue); + } + + protected String getValueName(String paramName) { int dot = paramName.lastIndexOf("."); String valueName = paramName; if (dot != -1) { valueName = paramName.substring(dot+1); } - parentheses = false; - return add(paramName + " " + constraint + " :" + valueName).addParam(valueName, paramValue); + return valueName; } /** @@ -460,6 +478,56 @@ } /** + * Add an element to the query with a list of different possible values. + * + * @param paramName name of the parameter in the query + * @param values different values for this parameter + * @return the TopiaQuery + * @see #add(java.lang.String, java.util.Collection, boolean) + */ + public TopiaQuery<E> add(String paramName, Collection<Object> values) { + return add(paramName, values, false); + } + + /** + * Add an element to the query with a list of different values. The IN key word will be used to + * set the different values. An other constraint on nullity can be set with isNull argument. + * The element can have one of the value from the collection or can be null if the isNull argument is true. + * + * @param paramName name of the parameter in the query + * @param values different values for this parameter + * @param isNull use it to test the nullity of parameter + * @return + * @see #add(java.lang.String) + */ + public TopiaQuery<E> add(String paramName, Collection<Object> values, boolean isNull) { + String queryIn = ""; + if (!values.isEmpty()) { +// String valueName = getValueName(paramName); +// queryIn += paramName + " IN (:" + valueName + ")"; +// addParam(valueName, values); + + queryIn += paramName + " IN ("; + int count = 1; + for (Object value : values) { + String valueName = getValueName(paramName) + count; + if (count != 1) { + queryIn += ", "; + } + queryIn += ":" + valueName; + addParam(valueName, value); + count++; + } + queryIn += ")"; + } + if (isNull) { + queryIn += !values.isEmpty() ? " OR " : ""; + queryIn += paramName + " IS NULL"; + } + return add(queryIn); + } + + /** * Add a map of properties to the where clause of the query. Each property will be added to the query with * Op.EQ operation, the key in the map is the property name, and the value is the value of the parameter in the * query. @@ -486,22 +554,33 @@ } /** - * Add an element to the select in the query. Used to add some parameters for the return of query. + * Set the select in the query. Depends on the result wanted in execute methods. * * @param select element to add * @return the TopiaQuery */ - public TopiaQuery<E> addSelect(String select) { - if (this.select == null) { - this.select = "SELECT "; - } else { - this.select += ", "; - } - this.select += select; + public TopiaQuery<E> setSelect(String select) { +// if (this.select == null) { +// this.select = "SELECT "; +// } else { +// this.select += ", "; +// } +// this.select += select; + this.select = select; return this; } /** + * Add the distinct key word in the query. The result will not have multiple same values. + * + * @return the TopiaQuery + */ + public TopiaQuery<E> addDistinct() { + this.distinct = true; + return this; + } + + /** * Add an element to the order in the query. Used to add some parameters to order by. * * @param order element to add @@ -801,7 +880,7 @@ public Object executeToObject(TopiaContext transaction, String select) throws TopiaException { String oldValue = this.select; if (!StringUtils.isEmpty(select)) { - this.select = "SELECT " + select; + setSelect(select); } Object result = null; setMaxResults(1); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-01-05 09:49:58 UTC (rev 1744) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-01-06 08:54:51 UTC (rev 1745) @@ -711,7 +711,7 @@ public List<String> findAllIds() throws TopiaException { //List<String> find = context.find("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); //return find; - return createQuery().addSelect(TopiaEntity.TOPIA_ID).execute(context); + return createQuery().setSelect(TopiaEntity.TOPIA_ID).execute(context); } @Override

1 0

r1744 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 05 Jan '10

05 Jan '10

Author: fdesbois Date: 2010-01-05 10:49:58 +0100 (Tue, 05 Jan 2010) New Revision: 1744 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Fix NPE when loadProperty 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 2010-01-04 11:21:29 UTC (rev 1743) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-05 09:49:58 UTC (rev 1744) @@ -914,7 +914,7 @@ if (log.isTraceEnabled()) { log.trace("load property '" + property + "' for '" + entity.getClass().getSimpleName() + "'"); } - if (Collection.class.isAssignableFrom(res.getClass())) { + if (res != null && Collection.class.isAssignableFrom(res.getClass())) { Collection list = (Collection) res; list.size(); }

1 0