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

r2251 - in trunk/topia-persistence/src/site: . rst
by bleny＠users.nuiton.org 16 Apr '11

16 Apr '11

Author: bleny Date: 2011-04-16 12:09:55 +0200 (Sat, 16 Apr 2011) New Revision: 2251 Url: http://nuiton.org/repositories/revision/topia/2251 Log: minor fixes in documentation Modified: trunk/topia-persistence/src/site/rst/howto.rst trunk/topia-persistence/src/site/rst/index.rst trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/rst/howto.rst =================================================================== --- trunk/topia-persistence/src/site/rst/howto.rst 2011-04-15 13:00:08 UTC (rev 2250) +++ trunk/topia-persistence/src/site/rst/howto.rst 2011-04-16 10:09:55 UTC (rev 2251) @@ -223,7 +223,7 @@ Manipulation des entités ~~~~~~~~~~~~~~~~~~~~~~~~ ->>> PersonDAO personDAO = <nom modele>Helper.getPersonDAO(transaction); +>>> PersonDAO personDAO = <nom modele>DAOHelper.getPersonDAO(transaction); Récupération d'un DAO pour accéder à une entité. Modified: trunk/topia-persistence/src/site/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-04-15 13:00:08 UTC (rev 2250) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-04-16 10:09:55 UTC (rev 2251) @@ -42,22 +42,21 @@ <menu name="Utilisateur" inherit="top"> <item name="Presentation" href="index.html" /> <item name="Utilisation" href="howto.html" /> + <item name="Génération des modèles" href="ModelGeneration.html"/> <item name="Tag values" href="tagvalues.html" /> + <item name="TopiaQuery" href="TopiaQuery.html"/> + <item name="Gestion des evenements" href="event.html"/> + <item name="FAQ" href="FAQ.html"/> </menu> <menu name="Developpeur"> <item name="Todo" href="Todo.html"/> <item name="Mapping hibernate" href="HibernateMapping.html"/> - <item name="Gestion des evenements" href="event.html"/> <item name="Isolation" href="Isolation.html"/> <item name="Schema migration" href="SchemaMigration.html"/> <item name="Securité" href="security.html"/> - <item name="Génération des modèles" href="ModelGeneration.html"/> <item name="TopiaContextFactory" href="Devel.html"/> - <item name="TopiaQuery" href="TopiaQuery.html"/> - <item name="FAQ" href="FAQ.html"/> <item name="Projets similaires" href="project.html"/> - <item name="Tag values" href="tagvalues.html"/> </menu> <menu name="Téléchargement">

1 0

r2250 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org 15 Apr '11

15 Apr '11

Author: hudson Date: 2011-04-15 15:00:08 +0200 (Fri, 15 Apr 2011) New Revision: 2250 Url: http://nuiton.org/repositories/revision/topia/2250 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-15 13:00:07 UTC (rev 2249) +++ trunk/pom.xml 2011-04-15 13:00:08 UTC (rev 2250) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -344,9 +344,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5.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 2011-04-15 13:00:07 UTC (rev 2249) +++ trunk/topia-persistence/pom.xml 2011-04-15 13:00:08 UTC (rev 2250) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-04-15 13:00:07 UTC (rev 2249) +++ trunk/topia-service-migration/pom.xml 2011-04-15 13:00:08 UTC (rev 2250) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-04-15 13:00:07 UTC (rev 2249) +++ trunk/topia-service-replication/pom.xml 2011-04-15 13:00:08 UTC (rev 2250) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-04-15 13:00:07 UTC (rev 2249) +++ trunk/topia-service-security/pom.xml 2011-04-15 13:00:08 UTC (rev 2250) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2249 - in tags: . topia-2.5.3
by hudson＠users.nuiton.org 15 Apr '11

15 Apr '11

Author: hudson Date: 2011-04-15 15:00:07 +0200 (Fri, 15 Apr 2011) New Revision: 2249 Url: http://nuiton.org/repositories/revision/topia/2249 Log: [maven-release-plugin] copy for tag topia-2.5.3 Added: tags/topia-2.5.3/ Property changes on: tags/topia-2.5.3 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2248 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by hudson＠users.nuiton.org 15 Apr '11

15 Apr '11

Author: hudson Date: 2011-04-15 15:00:05 +0200 (Fri, 15 Apr 2011) New Revision: 2248 Url: http://nuiton.org/repositories/revision/topia/2248 Log: [maven-release-plugin] prepare release topia-2.5.3 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-15 12:50:58 UTC (rev 2247) +++ trunk/pom.xml 2011-04-15 13:00:05 UTC (rev 2248) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> <modules> <module>topia-persistence</module> @@ -344,9 +344,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.5.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5.3</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-04-15 12:50:58 UTC (rev 2247) +++ trunk/topia-persistence/pom.xml 2011-04-15 13:00:05 UTC (rev 2248) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-04-15 12:50:58 UTC (rev 2247) +++ trunk/topia-service-migration/pom.xml 2011-04-15 13:00:05 UTC (rev 2248) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-04-15 12:50:58 UTC (rev 2247) +++ trunk/topia-service-replication/pom.xml 2011-04-15 13:00:05 UTC (rev 2248) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-04-15 12:50:58 UTC (rev 2247) +++ trunk/topia-service-security/pom.xml 2011-04-15 13:00:05 UTC (rev 2248) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2247 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework persistence
by tchemit＠users.nuiton.org 15 Apr '11

15 Apr '11

Author: tchemit Date: 2011-04-15 14:50:58 +0200 (Fri, 15 Apr 2011) New Revision: 2247 Url: http://nuiton.org/repositories/revision/topia/2247 Log: Evolution #1462: Remove deprecated method TopiaDAOImpl deprecated since a long time Evolution #1398: Add hibernate constants to TopiaContextFactory clean code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -29,6 +29,7 @@ import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Environment; import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.topia.framework.TopiaUtil; @@ -36,7 +37,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Properties; /** @@ -60,6 +60,34 @@ new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.SOFT); + public final static String CONFIG_DEFAULT_SCHEMA = Environment.DEFAULT_SCHEMA; + + public final static String CONFIG_USER = Environment.USER; + + public final static String CONFIG_PASS = Environment.PASS; + + public final static String CONFIG_DRIVER = Environment.DRIVER; + + public final static String CONFIG_DIALECT = Environment.DIALECT; + + public final static String CONFIG_CONNECTION_PROVIDER = Environment.CONNECTION_PROVIDER; + + public final static String CONFIG_BYTECODE_PROVIDER = Environment.BYTECODE_PROVIDER; + + public final static String CONFIG_CURRENT_SESSION_CONTEXT_CLASS = Environment.CURRENT_SESSION_CONTEXT_CLASS; + + public final static String CONFIG_GENERATE_STATISTICS = Environment.GENERATE_STATISTICS; + + public final static String CONFIG_FORMAT_SQL = Environment.FORMAT_SQL; + + public final static String CONFIG_HBM2DDL_AUTO = Environment.HBM2DDL_AUTO; + + public final static String CONFIG_POOL_SIZE = Environment.POOL_SIZE; + + public final static String CONFIG_SHOW_SQL = Environment.SHOW_SQL; + + public final static String CONFIG_URL = Environment.URL; + /** * Permet de connaitre la liste des contexts encore en memoire, utile pour * du debuggage. @@ -68,11 +96,11 @@ */ public static List<String> getContextOpened() { List<String> result = new ArrayList<String>(); - for (Entry<Properties, TopiaContext> e : contextCache.entrySet()) { + for (Properties e : contextCache.keySet()) { // Useless test : will never happened that e.getValue() is null, // not allowed for {@link AbstractReferenceMap#SOFT}. // if (e.getValue() != null) { - result.add(e.getKey().getProperty("hibernate.connection.url")); + result.add(e.getProperty(CONFIG_URL)); // } } return result; 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 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -241,7 +241,7 @@ String classService = config.getProperty(key); try { Class<?> forName = Class.forName(classService); - Object newInstance = forName.newInstance(); + Object newInstance = forName.getConstructor().newInstance(); TopiaService service = (TopiaService) newInstance; if (key.equals("topia.service." + service.getServiceName())) { result.put(service.getServiceName(), service); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -34,6 +34,7 @@ import org.hibernate.mapping.Table; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; +import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.RecursiveProperties; @@ -59,9 +60,15 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaUtil.class); - public final static String HIBERNATE_DEFAULT_SCHEMA = "hibernate.default_schema"; - public final static String TOPIA_PERSISTENCE_CLASSES = "topia.persistence.classes"; + /** @deprecated since 2.5.3, use now the constant {@link TopiaContextFactory#CONFIG_DEFAULT_SCHEMA}. */ + @Deprecated + public final static String HIBERNATE_DEFAULT_SCHEMA = + TopiaContextFactory.CONFIG_DEFAULT_SCHEMA; + /** @deprecated since 2.5.3, use the already present {@link TopiaContextImpl#TOPIA_PERSISTENCE_CLASSES}. */ + @Deprecated + public final static String TOPIA_PERSISTENCE_CLASSES = TopiaContextImpl.TOPIA_PERSISTENCE_CLASSES; + /** * Permet de récupérer le fichier de propriété ayant le nom passé en * argument. @@ -122,7 +129,7 @@ * @return the pattern computed */ public static Pattern getTopiaPattern(String format, - Class<? extends TopiaEntity>... classes) { + Class<? extends TopiaEntity>... classes) { String[] entityPatterns = new String[classes.length]; for (int i = 0; i < classes.length; i++) { Class<? extends TopiaEntity> aClass = classes[i]; @@ -249,7 +256,8 @@ if (testTable == null) { throw new IllegalArgumentException( - "could not find entity with name " + classMapping.getClassName()); + "could not find entity with name " + + classMapping.getClassName()); } @@ -292,6 +300,6 @@ * @return schema name */ public static String getSchemaName(Configuration config) { - return config.getProperty(HIBERNATE_DEFAULT_SCHEMA); + return config.getProperty(TopiaContextFactory.CONFIG_DEFAULT_SCHEMA); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -385,23 +385,13 @@ boolean existByQuery(TopiaQuery query) throws TopiaException; /** - * Compte le nombre d'entites en base - * - * @return le nombre total d'entites existantes - * @throws TopiaException if any pb while getting datas - * @deprecated since 2.3.4 ambiguous name, use {@link #count()} instead. - */ - @Deprecated - long size() throws TopiaException; - - /** * Count the number of existing entities. * * @return number of total entities * @throws TopiaException if any pb while getting datas * @since 2.3.4 */ - int count() throws TopiaException; + long count() throws TopiaException; /** * Count the number of entities based on {@code query}. 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 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -43,7 +43,6 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.metadata.ClassMetadata; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; @@ -181,26 +180,11 @@ log.debug("StackTrace", eee); } } -// } catch (InstantiationException eee) { -// if (log.isWarnEnabled()) { -// log.warn("Impossible d'instancier " + classname + "Impl"); -// } -// if (log.isDebugEnabled()) { -// log.debug("StackTrace", eee); -// } -// } catch (IllegalAccessException eee) { -// if (log.isWarnEnabled()) { -// log.warn("Impossible d'instancier " + classname + "Impl"); -// } -// if (log.isDebugEnabled()) { -// log.debug("StackTrace", eee); -// } -// } if (result == null) { // le impl n'est pas trouvé on essai avec la classe elle meme try { - result = entityClass.newInstance(); + result = entityClass.getConstructor().newInstance(); if (log.isDebugEnabled()) { log.debug("Utilisation de la classe " + classname + " pour " + classname); @@ -213,21 +197,6 @@ log.debug("StackTrace", eee); } } -// } catch (InstantiationException eee) { -// if (log.isWarnEnabled()) { -// log.warn("Impossible d'instancier " + classname); -// } -// if (log.isDebugEnabled()) { -// log.debug("StackTrace", eee); -// } -// } catch (IllegalAccessException eee) { -// if (log.isWarnEnabled()) { -// log.warn("Impossible d'instancier " + classname); -// } -// if (log.isDebugEnabled()) { -// log.debug("StackTrace", eee); -// } -// } } if (result == null) { @@ -563,21 +532,8 @@ return result; } - /** - * Count number of existing entities using {@link TopiaQuery#executeCount(TopiaContext)} - * - * @return a long for the number of entities in database - * @deprecated since 2.3.4 ambiguous name, use {@link #count()} instead. - */ @Override - @Deprecated - public long size() throws TopiaException { - long result = count(); - return result; - } - - @Override - public int count() throws TopiaException { + public long count() throws TopiaException { int result = countByQuery(createQuery()); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-04-15 08:52:51 UTC (rev 2246) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-04-15 12:50:58 UTC (rev 2247) @@ -55,30 +55,29 @@ package org.nuiton.topia.persistence; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.security.Permission; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.FlushMode; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.event.TopiaEntityListener; -import org.nuiton.topia.event.TopiaEntityVetoable; -import org.nuiton.topia.framework.TopiaContextImplementor; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.hibernate.metadata.ClassMetadata; -import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.security.Permission; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Cette classe permet d'avoir un ensemble de méthode implantée de façon * standard et plus spécifiquement pour Hibernate. @@ -548,7 +547,7 @@ criterion = or(criterion, Restrictions.like(propName, textValue)); } //numFields - boolean isNumber = (value instanceof Number); + boolean isNumber = value instanceof Number; if (value instanceof String) { try { Double.parseDouble((String) value); @@ -566,10 +565,10 @@ } } //boolFields - boolean isBoolean = (value instanceof Boolean); + boolean isBoolean = value instanceof Boolean; if (value instanceof String) { - isBoolean |= ("true".equalsIgnoreCase((String) value) || "false" - .equalsIgnoreCase((String) value)); + isBoolean |= "true".equalsIgnoreCase((String) value) || "false" + .equalsIgnoreCase((String) value); } if (isBoolean) { Boolean booleanValue; @@ -731,21 +730,7 @@ } } - /** - * Count number of existing entities using {@link org.nuiton.topia.framework.TopiaQuery#executeCount(org.nuiton.topia.TopiaContext) } - * FIXME-FD20091224 change type to int like in 2.2.2 version - * - * @return a long for the number of entities in database - */ @Override - public long size() throws TopiaException { - //int result = findAll().size(); -// List result = this.getContext().find("SELECT count(*) FROM " + getEntityClass().getName() + "Impl"); -// return (Long)result.get(0); - return new TopiaQuery(getEntityClass()).executeCount(context); - } - - @Override public E findByProperties(Map<String, Object> properties) throws TopiaException { return query(Restrictions.allEq(properties)); @@ -776,10 +761,10 @@ criteria.add(criterion); criteria.setMaxResults(1); List<E> result = (List<E>) criteria.list(); - int sizeBefore = (result != null ? result.size() : 0); + int sizeBefore = result != null ? result.size() : 0; result = getContext().getFiresSupport().fireEntitiesLoad(context, result); - int sizeAfter = (result != null ? result.size() : 0); + int sizeAfter = result != null ? result.size() : 0; if (sizeAfter < sizeBefore) { if (log.isDebugEnabled()) { log.debug((sizeBefore - sizeAfter) @@ -846,7 +831,7 @@ * Renvoie un Criteria créé avec l'entityClass * @param mode le FlushMode du Criteria * @return le Criteria nouvellement créé - * @throws org.nuiton.topia.TopiaException if any pb + * @throws TopiaException if any pb */ private Criteria createCriteria(FlushMode mode) throws TopiaException { Criteria criteria = getSession().createCriteria(entityClass); @@ -857,7 +842,7 @@ /** * Renvoie la Session contenue dans le contexte * @return hibernate session - * @throws org.nuiton.topia.TopiaException if any pb + * @throws TopiaException if any pb */ private Session getSession() throws TopiaException { return getContext().getHibernate();

1 0

r2246 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 15 Apr '11

15 Apr '11

Author: tchemit Date: 2011-04-15 10:52:51 +0200 (Fri, 15 Apr 2011) New Revision: 2246 Url: http://nuiton.org/repositories/revision/topia/2246 Log: Anomalie #561: PostgreSQL socket closed error (improve code) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-14 12:47:09 UTC (rev 2245) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-15 08:52:51 UTC (rev 2246) @@ -37,7 +37,6 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -188,27 +187,9 @@ synchronized (pool) { - // before getting any connection, make sure there is not a closed - // connection in pool, if so then remove them from the pool - - Iterator<?> itr = pool.iterator(); - while (itr.hasNext()) { - Connection conn = (Connection) itr.next(); - if (conn.isClosed()) { - - // this connection is closed!, remove it - itr.remove(); - - if (log.isDebugEnabled()) { - log.debug("Remove already closed connection from pool " + - connection); - } - } - } - // try to use a connection from the pool (if any) - if (!pool.isEmpty()) { + while (!pool.isEmpty() && connection == null) { int last = pool.size() - 1; if (log.isTraceEnabled()) { log.trace("using pooled JDBC connection, pool size: " + @@ -216,6 +197,16 @@ } connection = pool.remove(last); + if (connection.isClosed()) { + + // this connection is closed!, don't use it + connection = null; + + if (log.isDebugEnabled()) { + log.debug("Remove already closed connection from pool " + + connection); + } + } } }

1 0

14 Apr '11

Author: tchemit Date: 2011-04-14 14:47:09 +0200 (Thu, 14 Apr 2011) New Revision: 2245 Url: http://nuiton.org/repositories/revision/topia/2245 Log: add svn-eol property + missing headers Modified: trunk/LICENSE.txt trunk/README.txt trunk/doc/presentation/topia.tex trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml trunk/topia-persistence/LICENSE.txt trunk/topia-persistence/README.txt trunk/topia-persistence/pom.xml trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/event/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java trunk/topia-persistence/src/main/resources/META-INF/cache/argouml.org/profi… trunk/topia-persistence/src/main/resources/META-INF/cache/argouml.org/profi… trunk/topia-persistence/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties trunk/topia-persistence/src/site/rst/ModelGeneration.rst trunk/topia-persistence/src/site/rst/TopiaQuery.rst trunk/topia-persistence/src/site/rst/howto.rst trunk/topia-persistence/src/site/rst/tagvalues.rst trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/package-info.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/package-info.java trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties trunk/topia-persistence/src/test/resources/log4j.properties trunk/topia-persistence/src/test/xmi/topiatest.properties trunk/topia-service-history/LICENSE.txt trunk/topia-service-history/README.txt trunk/topia-service-history/changelog.txt trunk/topia-service-history/pom.xml trunk/topia-service-history/src/main/java/org/nuiton/topia/history/NoHistory.java trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryListener.java trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryService.java trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryServiceImpl.java trunk/topia-service-history/src/main/java/org/nuiton/topia/history/entities/HistoryImpl.java trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/0/org/codelutin/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 trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml trunk/topia-service-history/src/main/xmi/TopiaHistory.properties trunk/topia-service-history/src/site/rst/index.rst trunk/topia-service-history/src/site/site_fr.xml trunk/topia-service-history/src/test/java/org/nuiton/topia/history/HistoryTest.java trunk/topia-service-index/LICENSE.txt trunk/topia-service-index/README.txt trunk/topia-service-index/changelog.txt trunk/topia-service-index/pom.xml trunk/topia-service-index/src/main/java/org/nuiton/topia/index/IndexEntry.java trunk/topia-service-index/src/main/java/org/nuiton/topia/index/LuceneIndexer.java trunk/topia-service-index/src/main/java/org/nuiton/topia/index/NotIndexable.java trunk/topia-service-index/src/main/java/org/nuiton/topia/index/TopiaIndexImplementor.java trunk/topia-service-index/src/main/java/org/nuiton/topia/index/TopiaIndexService.java trunk/topia-service-index/src/site/rst/index.rst trunk/topia-service-index/src/site/site_fr.xml trunk/topia-service-index/src/test/java/org/nuiton/topia/index/IndexTest.java trunk/topia-service-migration/LICENSE.txt trunk/topia-service-migration/README.txt trunk/topia-service-migration/changelog.txt trunk/topia-service-migration/pom.xml trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml trunk/topia-service-migration/src/site/rst/index.rst trunk/topia-service-migration/src/site/rst/manualMigration.rst trunk/topia-service-migration/src/site/site_fr.xml trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml trunk/topia-service-replication/LICENSE.txt trunk/topia-service-replication/README.txt trunk/topia-service-replication/changelog.txt trunk/topia-service-replication/pom.xml trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.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/TopiaReplicationOperation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.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/DettachAssociation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java trunk/topia-service-replication/src/main/resources/META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties trunk/topia-service-replication/src/site/resources/dependencies.html trunk/topia-service-replication/src/site/resources/dependency-management.html trunk/topia-service-replication/src/site/rst/index.rst trunk/topia-service-replication/src/site/site_fr.xml trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java trunk/topia-service-replication/src/test/resources/META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation trunk/topia-service-replication/src/test/resources/log4j.properties trunk/topia-service-security/LICENSE.txt trunk/topia-service-security/README.txt trunk/topia-service-security/changelog.txt trunk/topia-service-security/pom.xml trunk/topia-service-security/src/license/THIRD-PARTY.properties trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaGroupImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/NoSecurityLoad.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyReadListener.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyWriteListener.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasAccessEntity.java 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/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml 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/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/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 trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.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/TopiaEntityAuthorizationImpl.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 trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties trunk/topia-service-security/src/site/rst/index.rst trunk/topia-service-security/src/site/site_fr.xml trunk/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java trunk/topia-soa/LICENSE.txt trunk/topia-soa/README.txt trunk/topia-soa/pom.xml trunk/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst trunk/topia-soa/src/site/rst/ApplicationServiceUsing.rst trunk/topia-soa/src/site/rst/index.rst trunk/topia-soa/src/site/site_fr.xml trunk/topia-soa/src/test/log4j.properties trunk/topia-soa/src/test/xmi/soaTest.properties Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doc/presentation/topia.tex ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/resources/META-INF/cache/argouml.org/profi… ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/resources/META-INF/cache/argouml.org/profi… ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/site/rst/ModelGeneration.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/site/rst/TopiaQuery.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/site/rst/howto.rst ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/topia-persistence/src/site/rst/tagvalues.rst =================================================================== --- trunk/topia-persistence/src/site/rst/tagvalues.rst 2011-04-14 12:46:27 UTC (rev 2244) +++ trunk/topia-persistence/src/site/rst/tagvalues.rst 2011-04-14 12:47:09 UTC (rev 2245) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ToPIA :: Persistence +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 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% +.. - Tag values ========== Property changes on: trunk/topia-persistence/src/site/rst/tagvalues.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java 2011-04-14 12:46:27 UTC (rev 2244) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java 2011-04-14 12:47:09 UTC (rev 2245) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.framework; import org.apache.commons.logging.Log; Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2011-04-14 12:46:27 UTC (rev 2244) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2011-04-14 12:47:09 UTC (rev 2245) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.framework; import org.apache.commons.logging.Log; Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/service/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/test/xmi/topiatest.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/java/org/nuiton/topia/history/NoHistory.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryListener.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/java/org/nuiton/topia/history/TopiaHistoryServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/java/org/nuiton/topia/history/entities/HistoryImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/0/org/codelutin/topia/history/entities/HistoryImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/main/xmi/TopiaHistory.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-history/src/test/java/org/nuiton/topia/history/HistoryTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/main/java/org/nuiton/topia/index/IndexEntry.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/main/java/org/nuiton/topia/index/LuceneIndexer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/main/java/org/nuiton/topia/index/NotIndexable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/main/java/org/nuiton/topia/index/TopiaIndexImplementor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/main/java/org/nuiton/topia/index/TopiaIndexService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-index/src/test/java/org/nuiton/topia/index/IndexTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/site/rst/manualMigration.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/resources/META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/site/resources/dependencies.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/site/resources/dependency-management.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/resources/META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-replication/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaGroupImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/NoSecurityLoad.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyReadListener.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyWriteListener.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasAccessEntity.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoable.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/event/TaasEntityVetoableRequestPermission.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/site/rst/ApplicationServiceUsing.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/site/rst/index.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/test/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/topia-soa/src/test/xmi/soaTest.properties ___________________________________________________________________ Added: svn:eol-style + native

1 0

r2244 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 14 Apr '11

14 Apr '11

Author: tchemit Date: 2011-04-14 14:46:27 +0200 (Thu, 14 Apr 2011) New Revision: 2244 Url: http://nuiton.org/repositories/revision/topia/2244 Log: Improve code Add javadoc Add license headers (svn keywords...) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-14 11:15:26 UTC (rev 2243) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-14 12:46:27 UTC (rev 2244) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.framework; import org.apache.commons.logging.Log; @@ -19,30 +43,75 @@ /** * Customized connection provider. + * + * This provider fix the following bug : + * http://nuiton.org/issues/show/561 + * + * To use this connection provider, add this property to topia configuration + * + * <pre> + * config.setProperty(Environment.CONNECTION_PROVIDER, TopiaConnectionProvider.class.getName()); + * </pre> + * + * or in a properties file : + * + * <pre> + * hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider + * </pre> * * @author tchemit <chemit(a)codelutin.com> * @since 2.5.3 */ public class TopiaConnectionProvider implements ConnectionProvider { + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaConnectionProvider.class); + + /** + * JDBC url of connection. + * + * This is a mandatory hibernate configuration vi the property + * {@link Environment#URL}. + */ private String url; + /** All grabbed connection properties */ private Properties connectionProps; + /** + * Sql isolation level to use in connection. + * + * Can be configured by hibernate property {@link Environment#ISOLATION_LEVELS}. + * + * @see Connection#getTransactionIsolation() + */ private Integer isolation; - private final List<Connection> pool = new ArrayList<Connection>(); + /** + * auto commit connection state. + * + * Can be configured by hibernate property {@link Environment#AUTOCOMMIT}. + * + * @see Connection#getAutoCommit() + */ + private boolean autocommit; + /** + * Size of connection pool. + * + * By default use {@code 20}, can be specify by using the hibernate + * configuration property {@link Environment#POOL_SIZE}. + */ private int poolSize; - private int checkedOut; + /** Our pool of connections which are not closed and availables. */ + private final List<Connection> pool; - private boolean autocommit; + public TopiaConnectionProvider() { + pool = new ArrayList<Connection>(); + } - /** Logger. */ - private static final Log log = - LogFactory.getLog(TopiaConnectionProvider.class); - @Override public void configure(Properties props) throws HibernateException { String driverClass = props.getProperty(Environment.DRIVER); @@ -114,11 +183,8 @@ @Override public Connection getConnection() throws SQLException { - if (log.isTraceEnabled()) { - log.trace("total checked-out connections: " + checkedOut); - } - // always clean the pool before any use of it + Connection connection = null; synchronized (pool) { @@ -127,8 +193,8 @@ Iterator<?> itr = pool.iterator(); while (itr.hasNext()) { - Connection connection = (Connection) itr.next(); - if (connection.isClosed()) { + Connection conn = (Connection) itr.next(); + if (conn.isClosed()) { // this connection is closed!, remove it itr.remove(); @@ -139,73 +205,74 @@ } } } + + // try to use a connection from the pool (if any) + if (!pool.isEmpty()) { int last = pool.size() - 1; if (log.isTraceEnabled()) { log.trace("using pooled JDBC connection, pool size: " + last); - checkedOut++; } - Connection pooled = pool.remove(last); - if (isolation != null) { - pooled.setTransactionIsolation(isolation); - } - if (pooled.getAutoCommit() != autocommit) - pooled.setAutoCommit(autocommit); - return pooled; + + connection = pool.remove(last); } } - log.debug("opening new JDBC connection"); - Connection conn = DriverManager.getConnection(url, connectionProps); - if (isolation != null) { - conn.setTransactionIsolation(isolation); + if (connection == null) { + + // the pool was empty, creates a new connection + + if (log.isDebugEnabled()) { + log.debug("opening new JDBC connection to " + url); + } + connection = DriverManager.getConnection(url, connectionProps); } - if (conn.getAutoCommit() != autocommit) { - conn.setAutoCommit(autocommit); - } - if (log.isDebugEnabled()) { - log.debug("created connection to: " + url + ", Isolation Level: " + - conn.getTransactionIsolation()); + // configure connection + + if (isolation != null) { + connection.setTransactionIsolation(isolation); } - if (log.isTraceEnabled()) { - checkedOut++; + if (connection.getAutoCommit() != autocommit) { + connection.setAutoCommit(autocommit); } - return conn; + return connection; } @Override public void closeConnection(Connection conn) throws SQLException { + // if connection is already closed, nothing has to be done + // we can't keep this connection (and can not be push in pool) + if (conn.isClosed()) { - // if connection already closed (I don't know how, make sure it is - // not any longer used by pool) if (log.isDebugEnabled()) { log.debug("Connection [" + conn + "] alreay closed!, will not use it any longer "); } return; } - if (log.isDebugEnabled()) { - checkedOut--; - } + // connection was not closed, can push it in the pool (if pool is not + // full) + synchronized (pool) { int currentSize = pool.size(); - if (currentSize < poolSize) { + if (currentSize < getPoolSize()) { if (log.isTraceEnabled()) { log.trace("returning connection to pool, pool size: " + (currentSize + 1)); } - pool.add(conn); return; } } + // pool was full, must release the connection which will be loose + if (log.isDebugEnabled()) { log.debug("closing JDBC connection"); } @@ -219,6 +286,7 @@ close(); } + @Override public void close() { if (log.isInfoEnabled()) { @@ -242,4 +310,29 @@ public boolean supportsAggressiveRelease() { return false; } + + public String getUrl() { + return url; + } + + public Properties getConnectionProps() { + return connectionProps; + } + + public Integer getIsolation() { + return isolation; + } + + public List<Connection> getPool() { + return pool; + } + + public int getPoolSize() { + return poolSize; + } + + public boolean isAutocommit() { + return autocommit; + } + } Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r2243 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia test/java/org/nuiton/topia/framework test/resources
by tchemit＠users.nuiton.org 14 Apr '11

14 Apr '11

Author: tchemit Date: 2011-04-14 13:15:26 +0200 (Thu, 14 Apr 2011) New Revision: 2243 Url: http://nuiton.org/repositories/revision/topia/2243 Log: Introduce a ConnectionProvider to fix Anomalie #561: PostgreSQL socket closed error Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-04-14 11:15:26 UTC (rev 2243) @@ -0,0 +1,245 @@ +package org.nuiton.topia.framework; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.connection.ConnectionProvider; +import org.hibernate.connection.ConnectionProviderFactory; +import org.hibernate.util.PropertiesHelper; +import org.hibernate.util.ReflectHelper; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + +/** + * Customized connection provider. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.3 + */ +public class TopiaConnectionProvider implements ConnectionProvider { + + private String url; + + private Properties connectionProps; + + private Integer isolation; + + private final List<Connection> pool = new ArrayList<Connection>(); + + private int poolSize; + + private int checkedOut; + + private boolean autocommit; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaConnectionProvider.class); + + @Override + public void configure(Properties props) throws HibernateException { + String driverClass = props.getProperty(Environment.DRIVER); + + poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20 + if (log.isInfoEnabled()) { + + log.info("Using Hibernate built-in connection pool (not for production use!)"); + log.info("Hibernate connection pool size: " + poolSize); + } + + autocommit = PropertiesHelper.getBoolean(Environment.AUTOCOMMIT, props); + if (log.isInfoEnabled()) + log.info("autocommit mode: " + autocommit); + + isolation = PropertiesHelper.getInteger(Environment.ISOLATION, props); + if (isolation != null) { + if (log.isInfoEnabled()) { + log.info("JDBC isolation level: " + + Environment.isolationLevelToString(isolation)); + } + } + + if (driverClass == null) { + + if (log.isWarnEnabled()) { + log.warn("no JDBC Driver class was specified by property " + + Environment.DRIVER); + } + } else { + try { + // trying via forName() first to be as close to DriverManager's semantics + Class.forName(driverClass); + } catch (ClassNotFoundException cnfe) { + try { + ReflectHelper.classForName(driverClass); + } catch (ClassNotFoundException e) { + String msg = "JDBC Driver class not found: " + driverClass; + log.error(msg, e); + throw new HibernateException(msg, e); + } + } + } + + url = props.getProperty(Environment.URL); + if (url == null) { + String msg = "JDBC URL was not specified by property " + + Environment.URL; + if (log.isErrorEnabled()) { + log.error(msg); + } + throw new HibernateException(msg); + } + + connectionProps = + ConnectionProviderFactory.getConnectionProperties(props); + + if (log.isInfoEnabled()) { + log.info("using driver: " + driverClass + " at URL: " + url); + } + // if debug level is enabled, then log the password, otherwise mask it + if (log.isDebugEnabled()) { + log.info("connection properties: " + connectionProps); + } else if (log.isInfoEnabled()) { + log.info("connection properties: " + + PropertiesHelper.maskOut(connectionProps, "password")); + } + } + + @Override + public Connection getConnection() throws SQLException { + if (log.isTraceEnabled()) { + log.trace("total checked-out connections: " + checkedOut); + } + + // always clean the pool before any use of it + + synchronized (pool) { + + // before getting any connection, make sure there is not a closed + // connection in pool, if so then remove them from the pool + + Iterator<?> itr = pool.iterator(); + while (itr.hasNext()) { + Connection connection = (Connection) itr.next(); + if (connection.isClosed()) { + + // this connection is closed!, remove it + itr.remove(); + + if (log.isDebugEnabled()) { + log.debug("Remove already closed connection from pool " + + connection); + } + } + } + if (!pool.isEmpty()) { + int last = pool.size() - 1; + if (log.isTraceEnabled()) { + log.trace("using pooled JDBC connection, pool size: " + + last); + checkedOut++; + } + Connection pooled = pool.remove(last); + if (isolation != null) { + pooled.setTransactionIsolation(isolation); + } + if (pooled.getAutoCommit() != autocommit) + pooled.setAutoCommit(autocommit); + return pooled; + } + } + + log.debug("opening new JDBC connection"); + Connection conn = DriverManager.getConnection(url, connectionProps); + if (isolation != null) { + conn.setTransactionIsolation(isolation); + } + if (conn.getAutoCommit() != autocommit) { + conn.setAutoCommit(autocommit); + } + + if (log.isDebugEnabled()) { + log.debug("created connection to: " + url + ", Isolation Level: " + + conn.getTransactionIsolation()); + } + if (log.isTraceEnabled()) { + checkedOut++; + } + + return conn; + } + + @Override + public void closeConnection(Connection conn) throws SQLException { + + if (conn.isClosed()) { + + // if connection already closed (I don't know how, make sure it is + // not any longer used by pool) + if (log.isDebugEnabled()) { + log.debug("Connection [" + conn + + "] alreay closed!, will not use it any longer "); + } + return; + } + if (log.isDebugEnabled()) { + checkedOut--; + } + + synchronized (pool) { + int currentSize = pool.size(); + if (currentSize < poolSize) { + if (log.isTraceEnabled()) { + log.trace("returning connection to pool, pool size: " + + (currentSize + 1)); + } + + pool.add(conn); + return; + } + } + + if (log.isDebugEnabled()) { + log.debug("closing JDBC connection"); + } + + conn.close(); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + close(); + } + + public void close() { + + if (log.isInfoEnabled()) { + log.info("cleaning up connection pool: " + url); + } + + for (Connection connection : pool) { + try { + connection.close(); + } catch (SQLException sqle) { + if (log.isWarnEnabled()) { + log.warn("problem closing pooled connection", sqle); + } + } + } + pool.clear(); + + } + + @Override + public boolean supportsAggressiveRelease() { + return false; + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2011-04-12 06:46:26 UTC (rev 2242) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2011-04-14 11:15:26 UTC (rev 2243) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Environment; import org.junit.Ignore; import org.nuiton.util.FileUtil; @@ -111,30 +112,40 @@ String dbname) throws IOException { - InputStream stream = TestHelper.class.getResourceAsStream(dbPropertiesPath); + Properties configuration = loadHibernateConfiguration(dbPropertiesPath); - Properties configuration = new Properties(); - - configuration.load(stream); - configuration.setProperty( - "topia.persistence.classes", - TopiaTestDAOHelper.getImplementationClassesAsString()); - // make sure we always use a different directory - String dbPath = new File(testDirectory, - dbname + '_' + System.nanoTime()).getAbsolutePath(); + String dbPath = getDbName(testDirectory, dbname); if (log.isInfoEnabled()) { log.info("dbPath = " + dbPath); } configuration.setProperty( - "hibernate.connection.url", + Environment.URL, +// "hibernate.connection.url", "jdbc:h2:file:" + dbPath); return configuration; } + public static Properties loadHibernateConfiguration(String dbPropertiesPath) throws IOException { + InputStream stream = TestHelper.class.getResourceAsStream(dbPropertiesPath); + + Properties configuration = new Properties(); + + configuration.load(stream); + configuration.setProperty( + "topia.persistence.classes", + TopiaTestDAOHelper.getImplementationClassesAsString()); + return configuration; + } + + public static String getDbName(File testDirectory, String dbname) { + return new File(testDirectory, + dbname + '_' + System.nanoTime()).getAbsolutePath(); + } + public static Properties initTopiaContextConfiguration(File testDirectory, String dbname) throws IOException { Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java 2011-04-14 11:15:26 UTC (rev 2243) @@ -0,0 +1,185 @@ +package org.nuiton.topia.framework; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.connection.ConnectionProvider; +import org.hibernate.connection.ConnectionProviderFactory; +import org.hibernate.util.PropertiesHelper; +import org.hibernate.util.ReflectHelper; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Properties; + +/** + * Customized connection provider. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.3 + */ +public class TopiaConnectionProviderHardCoded implements ConnectionProvider { + + private String url; + + private Properties connectionProps; + + private Integer isolation; + + private final ArrayList pool = new ArrayList(); + + private int poolSize; + + private int checkedOut = 0; + + private boolean autocommit; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaConnectionProviderHardCoded.class); + + @Override + public void configure(Properties props) throws HibernateException { + String driverClass = props.getProperty(Environment.DRIVER); + + poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20 + log.info("Using Hibernate built-in connection pool (not for production use!)"); + log.info("Hibernate connection pool size: " + poolSize); + + autocommit = PropertiesHelper.getBoolean(Environment.AUTOCOMMIT, props); + log.info("autocommit mode: " + autocommit); + + isolation = PropertiesHelper.getInteger(Environment.ISOLATION, props); + if (isolation != null) + log.info("JDBC isolation level: " + Environment.isolationLevelToString(isolation)); + + if (driverClass == null) { + log.warn("no JDBC Driver class was specified by property " + Environment.DRIVER); + } else { + try { + // trying via forName() first to be as close to DriverManager's semantics + Class.forName(driverClass); + } catch (ClassNotFoundException cnfe) { + try { + ReflectHelper.classForName(driverClass); + } catch (ClassNotFoundException e) { + String msg = "JDBC Driver class not found: " + driverClass; + log.error(msg, e); + throw new HibernateException(msg, e); + } + } + } + + // use a dummy directory to make sure only the connection provider knows + // the real directory where db is and then make sure hibernate always + // use the connection provider... + String directory = + props.getProperty(TopiaConnectionProviderTest.TEST_URL); + + url = directory; +// url = props.getProperty(Environment.URL); + +// if (url == null) { +// String msg = "JDBC URL was not specified by property " + Environment.URL; +// log.error(msg); +// throw new HibernateException(msg); +// } + + connectionProps = ConnectionProviderFactory.getConnectionProperties(props); + + log.info("using driver: " + driverClass + " at URL: " + url); + // if debug level is enabled, then log the password, otherwise mask it + if (log.isDebugEnabled()) { + log.info("connection properties: " + connectionProps); + } else if (log.isInfoEnabled()) { + log.info("connection properties: " + PropertiesHelper.maskOut(connectionProps, "password")); + } + } + + @Override + public Connection getConnection() throws SQLException { + if (log.isTraceEnabled()) + log.trace("total checked-out connections: " + checkedOut); + + synchronized (pool) { + if (!pool.isEmpty()) { + int last = pool.size() - 1; + if (log.isTraceEnabled()) { + log.trace("using pooled JDBC connection, pool size: " + last); + } + checkedOut++; + Connection pooled = (Connection) pool.remove(last); + if (isolation != null) + pooled.setTransactionIsolation(isolation.intValue()); + if (pooled.getAutoCommit() != autocommit) + pooled.setAutoCommit(autocommit); + return pooled; + } + } + + log.debug("opening new JDBC connection"); + Connection conn = DriverManager.getConnection(url, connectionProps); + if (isolation != null) conn.setTransactionIsolation(isolation); + if (conn.getAutoCommit() != autocommit) conn.setAutoCommit(autocommit); + + if (log.isDebugEnabled()) { + log.debug("created connection to: " + url + ", Isolation Level: " + conn.getTransactionIsolation()); + } +// if ( log.isTraceEnabled() ) + checkedOut++; + + return conn; + } + + @Override + public void closeConnection(Connection conn) throws SQLException { +// if ( log.isDebugEnabled() ) + checkedOut--; + + synchronized (pool) { + int currentSize = pool.size(); + if (currentSize < poolSize) { + if (log.isTraceEnabled()) { + log.trace("returning connection to pool, pool size: " + (currentSize + 1)); + } + pool.add(conn); + return; + } + } + + log.debug("closing JDBC connection"); + + conn.close(); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + close(); + } + + public void close() { + + log.info("cleaning up connection pool: " + url); + + Iterator iter = pool.iterator(); + while (iter.hasNext()) { + try { + ((Connection) iter.next()).close(); + } catch (SQLException sqle) { + log.warn("problem closing pooled connection", sqle); + } + } + pool.clear(); + + } + + @Override + public boolean supportsAggressiveRelease() { + return false; + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2011-04-14 11:15:26 UTC (rev 2243) @@ -0,0 +1,107 @@ +package org.nuiton.topia.framework; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Environment; +import org.junit.After; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.topia.TestHelper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topiatest.Personne; + +import java.io.File; +import java.util.Locale; +import java.util.Properties; + +import static org.junit.Assert.assertNotNull; + +/** + * To test the {@link TopiaConnectionProvider} and make sure all connections + * are done from here... + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.3 + */ +public class TopiaConnectionProviderTest { + + + private static final Log log = + LogFactory.getLog(TopiaConnectionProviderTest.class); + + protected static File testBasedir; + + public static final String TEST_URL = "testURL"; + + protected TopiaContext root; + + @BeforeClass + public static void setUpClass() throws Exception { + + testBasedir = TestHelper.getTestBasedir(TopiaConnectionProviderTest.class); + } + + @After + public void tearDown() throws TopiaException { + if (root != null && !root.isClosed()) { + root.closeContext(); + } + } + + @Test + public void testWithHardcoded() throws Exception { + + Properties dbProperties = TestHelper.loadHibernateConfiguration( + "/TopiaConnectionProviderHardcoded.properties"); + + File directory = new File(TestHelper.getDbName(testBasedir, "testWithHardcoded")); + + String dbPath = new File(directory, "real" + File.separator + "db").getAbsolutePath(); + Assert.assertFalse(new File(dbPath).getParentFile().exists()); + + String dbPathFake = new File(directory, "fake" + File.separator + "db").getAbsolutePath(); + + Assert.assertFalse(new File(dbPathFake).getParentFile().exists()); + + // give the path where connection provider will create db + dbProperties.setProperty(TEST_URL, "jdbc:h2:file:" + dbPath); + + // give a fake db path (we will make sure it is never create after hibernate usage). + dbProperties.setProperty(Environment.URL, "jdbc:h2:file:" + dbPathFake); + + root = TopiaContextFactory.getContext(dbProperties); + + Locale.setDefault(Locale.FRANCE); + + doStuffOnDb(); + + // the db file must have been created + Assert.assertTrue(new File(dbPath).getParentFile().exists()); + + // make sure the fake db path was never used + Assert.assertFalse(new File(dbPathFake).getParentFile().exists()); + } + + private void doStuffOnDb() throws TopiaException { + TopiaContext transaction = root.beginTransaction(); + + try { + PersonDAO dao = TopiaTestDAOHelper.getPersonDAO(transaction); + + Person personne = dao.create(Personne.PROPERTY_NAME, "Jack Bauer"); + transaction.commitTransaction(); + String idPersonne = personne.getTopiaId(); + assertNotNull(idPersonne); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Copied: trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties (from rev 2242, trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties) =================================================================== --- trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties (rev 0) +++ trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties 2011-04-14 11:15:26 UTC (rev 2243) @@ -0,0 +1,35 @@ +### +# #%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% +### +# Proprietes par defaut pour une base de donnees de type H2 +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProviderHardCoded +# tchemit 2010-11-28 : comment this line, each test must define his own db path +#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data \ No newline at end of file Property changes on: trunk/topia-persistence/src/test/resources/TopiaConnectionProviderHardcoded.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2242 - trunk/topia-service-security
by tchemit＠users.nuiton.org 12 Apr '11

12 Apr '11

Author: tchemit Date: 2011-04-12 08:46:26 +0200 (Tue, 12 Apr 2011) New Revision: 2242 Url: http://nuiton.org/repositories/revision/topia/2242 Log: fix svn:ignore Modified: trunk/topia-service-security/ Property changes on: trunk/topia-service-security ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath .project target .settings + *.ipr *.iws *.iml .classpath .project target .settings

1 0