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

r2240 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-security/src/main/java/org/nuiton/topia/taas
by sletellier＠users.nuiton.org April 11, 2011

April 11, 2011

Author: sletellier Date: 2011-04-11 15:21:21 +0200 (Mon, 11 Apr 2011) New Revision: 2240 Url: http://nuiton.org/repositories/revision/topia/2240 Log: - Introduce constant Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 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-11 13:20:16 UTC (rev 2239) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-04-11 13:21:21 UTC (rev 2240) @@ -60,6 +60,7 @@ 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"; /** * Permet de récupérer le fichier de propriété ayant le nom passé en Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-04-11 13:20:16 UTC (rev 2239) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-04-11 13:21:21 UTC (rev 2240) @@ -100,6 +100,7 @@ public static final String SERVICE_SUBJECT = "topia.service.taas.subject"; + public static final String TOPIA_SERVICE_TAAS = "topia.service.taas"; private TaasPolicy policy = new TaasPolicy(this); @@ -160,7 +161,7 @@ // Properties config = rootContext.getConfig(); // Hack to not reload this service - config.remove("topia.service.taas"); + config.remove(TOPIA_SERVICE_TAAS); String persistences = config.getProperty("topia.persistence.classes"); for (Class<?> klass : getPersistenceClasses()) {

1 0

r2239 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by sletellier＠users.nuiton.org April 11, 2011

April 11, 2011

Author: sletellier Date: 2011-04-11 15:20:16 +0200 (Mon, 11 Apr 2011) New Revision: 2239 Url: http://nuiton.org/repositories/revision/topia/2239 Log: Use set implementation to prevent double persistance class registration (http://www.nuiton.org/issues/show/1454) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 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-11 08:46:33 UTC (rev 2238) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-04-11 13:20:16 UTC (rev 2239) @@ -83,6 +83,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -612,14 +613,17 @@ } // ajout des classes dites persistentes + Set<Class<?>> hibernatePersistanceClasses = new HashSet<Class<?>>(); for (TopiaService service : getServices().values()) { Class<?>[] classes = service.getPersistenceClasses(); // certains service n'ont pas de classe persistantes if (classes != null) { - for (Class<?> clazz : classes) { - hibernateConfiguration.addClass(clazz); - } + // sletellier 20110411 : http://www.nuiton.org/issues/show/1454 + hibernatePersistanceClasses.addAll(Arrays.asList(classes)); +// for (Class<?> clazz : classes) { +// hibernateConfiguration.addClass(clazz); +// } } } @@ -645,10 +649,19 @@ classname)); } persistenceClasses.add(clazz); - hibernateConfiguration.addClass(clazz); + + // sletellier 20110411 : http://www.nuiton.org/issues/show/1454 +// hibernateConfiguration.addClass(clazz); + hibernatePersistanceClasses.add(clazz); } } + // sletellier 20110411 : http://www.nuiton.org/issues/show/1454 + // Add persistance classes in hibernate config + for (Class<?> persistanceClass : hibernatePersistanceClasses) { + hibernateConfiguration.addClass(persistanceClass); + } + Properties prop = new Properties(); prop.putAll(hibernateConfiguration.getProperties()); prop.putAll(getConfig());

1 0

r2238 - trunk
by tchemit＠users.nuiton.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 10:46:33 +0200 (Mon, 11 Apr 2011) New Revision: 2238 Url: http://nuiton.org/repositories/revision/topia/2238 Log: Update mavenpom4redmineAndCentral to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-30 16:47:45 UTC (rev 2237) +++ trunk/pom.xml 2011-04-11 08:46:33 UTC (rev 2238) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <artifactId>topia</artifactId>

1 0