Author: fdesbois Date: 2009-10-19 16:20:46 +0200 (Mon, 19 Oct 2009) New Revision: 2783 Modified: trunk/changelog.txt trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java trunk/pollen-ui/src/main/resources/pollen.properties trunk/pom.xml Log: Remove model version from properties file to use version given by PollenModelDAOHelper Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-19 13:30:28 UTC (rev 2782) +++ trunk/changelog.txt 2009-10-19 14:20:46 UTC (rev 2783) @@ -1,5 +1,9 @@ ChangeLog +1.2.0 +- Evol #54 +- Ano #49 + 1.1.0 - liste de votants à partir d'un serveur ldap - export de sondage Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2009-10-19 13:30:28 UTC (rev 2782) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2009-10-19 14:20:46 UTC (rev 2783) @@ -172,8 +172,8 @@ conf = PropertiesLoader.loadPropertiesFile(propertiesFilename); conf.setProperty("topia.persistence.classes", PollenModelDAOHelper .getImplementationClassesAsString()); - /*conf.setProperty("topia.service.migration.version", PollenModelDAOHelper - .getVersion());*/ + conf.setProperty("topia.service.migration.version", PollenModelDAOHelper + .getModelVersion()); // Construction du contexte global buildContext(); Modified: trunk/pollen-ui/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-ui/src/main/resources/pollen.properties 2009-10-19 13:30:28 UTC (rev 2782) +++ trunk/pollen-ui/src/main/resources/pollen.properties 2009-10-19 14:20:46 UTC (rev 2783) @@ -19,7 +19,6 @@ topia.service.migration.callbackhandlers=org.chorem.pollen.business.migration.PollenMigrationCallbackHandler topia.service.migration.mappingsdir=oldmappings topia.service.migration.modelnames=pollen -topia.service.migration.version=1.2 ## Initialisation de la base de donn\u00C3\u00A9es choiceType=DATE,IMAGE,TEXT Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-19 13:30:28 UTC (rev 2782) +++ trunk/pom.xml 2009-10-19 14:20:46 UTC (rev 2783) @@ -283,7 +283,7 @@ <!-- customized versions --> <!--javadoc.version>2.4</javadoc.version--> <topia.version>2.2.2-SNAPSHOT</topia.version> - <eugene.version>1.0.0</eugene.version> + <eugene.version>1.0.1-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> <!--Multilanguage maven-site -->