June 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

Jenkins build became unstable: franciaflex-magalie #76
by admin+hudson＠codelutin.com 27 Jun '13

27 Jun '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/76/changes>

1 1

r257 - in trunk: magalie-persistence magalie-persistence/src/main/java/com/franciaflex/magalie magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 11:54:30 +0200 (Thu, 27 Jun 2013) New Revision: 257 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: factorize oracle compatible mode in hibernate-oracle.properties ; add some validation in kanban ; use ' SANS' for locations code Modified: trunk/magalie-persistence/pom.xml trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/pom.xml 2013-06-27 09:54:30 UTC (rev 257) @@ -145,7 +145,6 @@ <configuration> <type>CREATE</type> <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> - <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-create-oracle.sql</outputFile> </configuration> </execution> @@ -157,14 +156,12 @@ <configuration> <type>DROP</type> <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> - <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-drop-oracle.sql</outputFile> </configuration> </execution> </executions> <configuration> <target>SCRIPT</target> - <hibernateProperties>${maven.src.dir}/main/resources/magalie.properties</hibernateProperties> </configuration> <dependencies>  Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-27 09:54:30 UTC (rev 257) @@ -23,15 +23,17 @@ * #L% */ -import com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; +import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.Properties; @@ -42,11 +44,7 @@ protected ApplicationConfig applicationConfig; - protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters = - ImmutableMap.of( - "hibernate.ejb.naming_strategy", org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy.class.getCanonicalName(), - "hibernate.dialect", MagalieOracleHibernateDialect.class.getCanonicalName() - ); + protected ImmutableMap<String,String> oracleCompatibilityModeJpaParameters; public MagalieApplicationConfig() { applicationConfig = new ApplicationConfig(); @@ -79,11 +77,32 @@ if (log.isInfoEnabled()) { log.info("oracle compatibility mode enabled: overriding settings with " + oracleCompatibilityModeJpaParameters); } - jpaParameters.putAll(oracleCompatibilityModeJpaParameters); + jpaParameters.putAll(getOracleCompatibilityModeJpaParameters()); } return jpaParameters; } + protected ImmutableMap<String, String> getOracleCompatibilityModeJpaParameters() { + if (oracleCompatibilityModeJpaParameters == null) { + InputStream inputStream = null; + try { + inputStream = getClass().getResourceAsStream("/hibernate-oracle.properties"); + Properties oracleCompatibilityModeProperties = new Properties(); + oracleCompatibilityModeProperties.load(inputStream); + oracleCompatibilityModeJpaParameters = Maps.fromProperties(oracleCompatibilityModeProperties); + IOUtils.closeQuietly(inputStream); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("should never occur", e); + } + throw new MagalieTechnicalException(e); + } finally { + IOUtils.closeQuietly(inputStream); + } + } + return oracleCompatibilityModeJpaParameters; + } + public boolean isDevMode() { boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); return isDevMode; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-06-27 09:54:30 UTC (rev 257) @@ -100,7 +100,7 @@ } public static String codeForWarehouseWithoutLocations() { - return "SANS"; + return " SANS"; } public static String codeForReceptionLocations() { Modified: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:54:30 UTC (rev 257) @@ -1 +1,2 @@ hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy +hibernate.dialect=com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-06-27 09:54:30 UTC (rev 257) @@ -64,7 +64,7 @@ serviceContext.setMagalieApplicationConfig(getMagalieApplicationConfig()); - EntityManager entityManager = getJpaEntityManagerRule().getEntityManager(); + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); JpaMagaliePersistenceContext jpaMagaliePersistenceContext = new JpaMagaliePersistenceContext(entityManager); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-06-27 09:54:30 UTC (rev 257) @@ -138,6 +138,14 @@ Company company = session.getCompany(); + if (destinationWarehouseId == null) { + + addFieldError("destinationWarehouseId", "Vous devez sélectionner un magasin de destination"); + + return INPUT; + + } + destinationWarehouse = service.getStore(destinationWarehouseId); // save used destination warehouse to propose it by default on next kanban

1 0

r256 - in trunk: . magalie-persistence magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 11:16:36 +0200 (Thu, 27 Jun 2013) New Revision: 256 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: better conf for sql generation Added: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties Modified: trunk/magalie-persistence/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-25 16:55:12 UTC (rev 255) +++ trunk/magalie-persistence/pom.xml 2013-06-27 09:16:36 UTC (rev 256) @@ -144,7 +144,8 @@ </goals> <configuration> <type>CREATE</type> - <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> + <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> + <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-create-oracle.sql</outputFile> </configuration> </execution> @@ -155,32 +156,11 @@ </goals> <configuration> <type>DROP</type> - <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> + <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> + <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-drop-oracle.sql</outputFile> </configuration> </execution> - <execution> - <id>executionCreateMysql</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>CREATE</type> - <hibernateDialect>org.hibernate.dialect.MySQLDialect</hibernateDialect> - <outputFile>${project.build.directory}/generated-sources/magalie-create-mysql.sql</outputFile> - </configuration> - </execution> - <execution> - <id>executionDropMysql</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>DROP</type> - <hibernateDialect>org.hibernate.dialect.MySQLDialect</hibernateDialect> - <outputFile>${project.build.directory}/generated-sources/magalie-drop-mysql.sql</outputFile> - </configuration> - </execution> </executions> <configuration> <target>SCRIPT</target> Added: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties (rev 0) +++ trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:16:36 UTC (rev 256) @@ -0,0 +1 @@ +hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-25 16:55:12 UTC (rev 255) +++ trunk/pom.xml 2013-06-27 09:16:36 UTC (rev 256) @@ -345,6 +345,7 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> +  <version>1.0.1</version> </plugin>

1 0

r255 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com 25 Jun '13

25 Jun '13

Author: bleny Date: 2013-06-25 18:55:12 +0200 (Tue, 25 Jun 2013) New Revision: 255 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use 'number' in oracle for double fields Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 12:04:48 UTC (rev 254) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 16:55:12 UTC (rev 255) @@ -40,7 +40,7 @@ public MagalieOracleHibernateDialect() { super(); - registerColumnType(Types.DOUBLE, "float"); + registerColumnType(Types.DOUBLE, "number"); } }

1 0

r254 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com 25 Jun '13

25 Jun '13

Author: bleny Date: 2013-06-25 14:04:48 +0200 (Tue, 25 Jun 2013) New Revision: 254 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prefix all magalie config option by 'magalie.' Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-25 08:59:02 UTC (rev 253) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-25 12:04:48 UTC (rev 254) @@ -46,12 +46,12 @@ "", String.class), ORACLE_COMPATIBILITY_MODE( - "oracleCompatibilityMode", + "magalie.oracleCompatibilityMode", "Empêche la création de noms d'identifiants de plus de 30 caractères, utilise Float pour persister les doubles", "false", Boolean.class), DEV_MODE( - "devMode", + "magalie.devMode", "Mode développement, court-circuite l'envoi de mail", "true", Boolean.class),

1 0

r253 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/exception
by bleny＠users.forge.codelutin.com 25 Jun '13

25 Jun '13

Author: bleny Date: 2013-06-25 10:59:02 +0200 (Tue, 25 Jun 2013) New Revision: 253 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing file header Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.hibernate.dialect.Oracle10gDialect; import java.sql.Types; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Article; public class IllegalWithdrawException extends MagalieException { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser;

1 0

r252 - in trunk: magalie-persistence magalie-persistence/src/main/java/com/franciaflex/magalie magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/resources magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 25 Jun '13

25 Jun '13

Author: bleny Date: 2013-06-25 10:58:09 +0200 (Tue, 25 Jun 2013) New Revision: 252 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in Oracle, persist double as 'float' sql type Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java Removed: trunk/magalie-web/src/main/resources/magalie-production.properties Modified: trunk/magalie-persistence/pom.xml trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/pom.xml 2013-06-25 08:58:09 UTC (rev 252) @@ -37,6 +37,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <scope>compile</scope>  </dependency> <dependency> Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-25 08:58:09 UTC (rev 252) @@ -23,6 +23,8 @@ * #L% */ +import com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.logging.Log; @@ -40,6 +42,12 @@ protected ApplicationConfig applicationConfig; + protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters = + ImmutableMap.of( + "hibernate.ejb.naming_strategy", org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy.class.getCanonicalName(), + "hibernate.dialect", MagalieOracleHibernateDialect.class.getCanonicalName() + ); + public MagalieApplicationConfig() { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(MagalieConfigOption.values()); @@ -67,6 +75,12 @@ jpaParameters.putAll((Map) hibernateProperties); Properties jpaProperties = applicationConfig.getOptionStartsWith("javax.persistence"); jpaParameters.putAll((Map) jpaProperties); + if (isOracleCompatibilityMode()) { + if (log.isInfoEnabled()) { + log.info("oracle compatibility mode enabled: overriding settings with " + oracleCompatibilityModeJpaParameters); + } + jpaParameters.putAll(oracleCompatibilityModeJpaParameters); + } return jpaParameters; } @@ -74,4 +88,10 @@ boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); return isDevMode; } + + public boolean isOracleCompatibilityMode() { + boolean isOracleCompatibilityMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.ORACLE_COMPATIBILITY_MODE.key); + return isOracleCompatibilityMode; + } + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-25 08:58:09 UTC (rev 252) @@ -45,6 +45,11 @@ "L'adresse d'expéditeur pour les mails de notifications", "", String.class), + ORACLE_COMPATIBILITY_MODE( + "oracleCompatibilityMode", + "Empêche la création de noms d'identifiants de plus de 30 caractères, utilise Float pour persister les doubles", + "false", Boolean.class), + DEV_MODE( "devMode", "Mode développement, court-circuite l'envoi de mail", Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:58:09 UTC (rev 252) @@ -0,0 +1,23 @@ +package com.franciaflex.magalie.persistence; + +import org.hibernate.dialect.Oracle10gDialect; + +import java.sql.Types; + +/** + * In the actual database, we are unable to create some views with columns + * typed as "double precision", so we map all double in the entities + * to "float" in database. + * + * @link http://stackoverflow.com/questions/2524966/hibernate-found-float-expected-d… + * @link http://docs.oracle.com/cd/B28359_01/server.111/b28285/sqlqr06.htm#CHDJJEEA show that + * SQL type DOUBLE PRECISION is actually implemented as FLOAT(126) + */ +public class MagalieOracleHibernateDialect extends Oracle10gDialect { + + public MagalieOracleHibernateDialect() { + super(); + registerColumnType(Types.DOUBLE, "float"); + } + +} Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-25 08:58:09 UTC (rev 252) @@ -28,7 +28,7 @@ hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy +hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.c3p0.min_size=3 hibernate.c3p0.max_size=5 Deleted: trunk/magalie-web/src/main/resources/magalie-production.properties =================================================================== --- trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-25 08:58:09 UTC (rev 252) @@ -1,34 +0,0 @@ -### -# #%L -# MagaLiE :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2013 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero 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 Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### - -hibernate.hbm2ddl.auto=validate -hibernate.show_sql=false -hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy - -magalie.devMode=${devMode} - -hibernate.c3p0.min_size=3 -hibernate.c3p0.max_size=5 -hibernate.c3p0.timeout=1800 -hibernate.c3p0.max_statements=50

1 0

r251 - trunk/magalie-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: bleny Date: 2013-06-21 18:11:19 +0200 (Fri, 21 Jun 2013) New Revision: 251 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove 'driverLicense' from model Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ)

1 0

r250 - trunk
by bleny＠users.forge.codelutin.com 20 Jun '13

20 Jun '13

Author: bleny Date: 2013-06-20 17:36:30 +0200 (Thu, 20 Jun 2013) New Revision: 250 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable version of hibernate4-maven-plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-20 15:34:44 UTC (rev 249) +++ trunk/pom.xml 2013-06-20 15:36:30 UTC (rev 250) @@ -345,7 +345,7 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.1</version> </plugin> </plugins>

1 0

r249 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com 20 Jun '13

20 Jun '13

Author: bleny Date: 2013-06-20 17:34:44 +0200 (Thu, 20 Jun 2013) New Revision: 249 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: version according to roadmap in poms Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-persistence/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-services/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-web/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name>

1 0