Author: chatellier Date: 2008-11-14 11:02:43 +0000 (Fri, 14 Nov 2008) New Revision: 1218 Modified: topia-service/trunk/changelog topia-service/trunk/pom.xml topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceImpl.java topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml Log: Correction d'un probleme d'interpretation des \ sous windows Modified: topia-service/trunk/changelog =================================================================== --- topia-service/trunk/changelog 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/changelog 2008-11-14 11:02:43 UTC (rev 1218) @@ -1,3 +1,6 @@ +0.9.1 + * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) + 0.9 * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 * <poussin> modif dans service de migration pour permettre a l'app de Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/pom.xml 2008-11-14 11:02:43 UTC (rev 1218) @@ -37,6 +37,13 @@ <version>2.3.2</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> <!--BD H2 pour le test--> <dependency> @@ -53,7 +60,7 @@ <!-- ************************************************************* --> <name>ToPIA Service</name> - <version>0.10-SNAPSHOT</version> + <version>0.9.1-SNAPSHOT</version> <description> ToPIA Service est une librairie de ToPIA pour la gestion de sercices. </description> @@ -73,7 +80,7 @@ <labs.project>topia</labs.project> <!-- topia version --> - <topia.version>2.0.27</topia.version> + <topia.version>2.0.28</topia.version> <!-- Test FIXME : should be ok --> <maven.test.skip>true</maven.test.skip> @@ -86,7 +93,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.60</version> + <version>0.61</version> <executions> <execution> <phase>process-sources</phase> Modified: topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceImpl.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/src/main/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-11-14 11:02:43 UTC (rev 1218) @@ -473,7 +473,8 @@ Map<Version, Configuration> mVersionAndConfigurationMap = null; List<URL> urls = null; - urls = Resource.getURLs(".*" + mappingsDirectory + File.separator + ".*"); + // Don't use File.separator, don't work on windows + urls = Resource.getURLs(".*" + mappingsDirectory + "/.*"); if (urls != null && urls.size() > 0) { @@ -521,7 +522,8 @@ * @return une configuration hibernate */ protected Configuration getSingleConfiguration(Version version) { - String mappingVersionDir = mappingsDirectory + File.separator + version.getVersion(); + // Don't use File.separator, don't work on windows + String mappingVersionDir = mappingsDirectory + "/" + version.getVersion(); ConfigurationHelper cfgHelper = ConfigurationHelper.getInstance(); Configuration cfgForVersion = cfgHelper.getConfigurationInDirectory(mappingVersionDir); Modified: topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/src/main/java/org/codelutin/topia/migration/TopiaMigrationServiceImpl.java 2008-11-14 11:02:43 UTC (rev 1218) @@ -203,7 +203,8 @@ String[] modelnames = modelnamesList.split(","); for(String modelname : modelnames) { - this.setMappingsDirectory(mappingdir + File.separator + modelname); + // Don't use File.separator, don't work on windows + this.setMappingsDirectory(mappingdir + "/" + modelname); boolean complete = false; Modified: topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java 2008-11-14 11:02:43 UTC (rev 1218) @@ -108,8 +108,13 @@ // le trouver, donc que ce soit un dossier ou un jar ici importe peu List<URL> urls = null; - urls = Resource.getURLs(".*" + pathDirectory + File.separator + regexFilename); + // Don't use File.separator, don't work on windows + String pattern = ".*" + pathDirectory + "/" + regexFilename; + + // find all mapping + urls = Resource.getURLs(pattern); + logger.debug("Loading mappings in " + pathDirectory); if (urls != null && urls.size() > 0) { Modified: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2008-11-14 09:37:11 UTC (rev 1217) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2008-11-14 11:02:43 UTC (rev 1218) @@ -10,7 +10,7 @@ <property name="password" type="text" access="field" column="password" node="password"/> <property name="note" type="text" access="field" column="note" node="note"/> <property name="linkApplication" type="text" access="field" column="linkApplication" node="linkApplication"/> - <bag name="topiaGroup" table="topiagroup_topiauser" lazy="true" node="topiaGroup" embed-xml="true"> + <bag name="topiaGroup" table="topiagroup_topiauser" inverse="true" lazy="true" node="topiaGroup" embed-xml="true"> <key column="topiaUser"/> <many-to-many class="org.codelutin.topia.security.entities.user.TopiaGroupImpl" column="topiaGroup" node="topiaId"/> </bag>