This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7f31831a98f5819e0845fc6129d8168a28f71e29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 12 23:48:36 2014 +0200 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon --- pom.xml | 5 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../tutti/persistence/test/DatabaseResource.java | 58 ++-------------------- ...ervice.technical.sanity.task.DatabaseSanityTask | 2 - ...ro.specific.ReferentialSynchroSpecificTableTask | 2 - .../src/main/filtered-resources/tutti.config | 1 + 6 files changed, 8 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index 84c7002..4919ea4 100644 --- a/pom.xml +++ b/pom.xml @@ -133,10 +133,9 @@ <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> <jaxxVersion>2.12</jaxxVersion> - <!--<swingXVersion>1.6.4</swingXVersion>--> - <swingXVersion>1.6.5-1</swingXVersion> + <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.7</slf4jVersion> - <adagioVersion>3.6.2</adagioVersion> + <adagioVersion>3.6.3-SNAPSHOT</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> <springVersion>4.1.0.RELEASE</springVersion> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java index c89a2f2..8c0447a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java @@ -941,7 +941,7 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic source.getInternationalRegistrationCode(), registrationLocationId, source.getName(), vesselTypeId, - true); + false); // Fill the result bean Vessel result = Vessels.newVessel(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java index cae7f4e..6d6c81f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java @@ -52,9 +52,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; import java.util.List; import java.util.Properties; import java.util.Set; @@ -246,8 +243,7 @@ public class DatabaseResource implements TestRule { if (writeDb) { - // check db exist in src/test/dbName - + // check db exist in src/test/data/dbName db = FileUtil.getFileFromPaths(new File("src"), "test", "data", dbName); } else { @@ -259,8 +255,7 @@ public class DatabaseResource implements TestRule { if (!db.exists()) { if (log.isWarnEnabled()) { - log.warn("Could not find db at " + db + ", test [" + - testClass + "] is skipped."); + log.warn("Could not find db at " + db + ", test [" + testClass + "] is skipped."); } Assume.assumeTrue(false); } @@ -320,12 +315,11 @@ public class DatabaseResource implements TestRule { } public void copyDb(File target, boolean readonly, Properties p) throws IOException { - File db = FileUtil.getFileFromPaths(new File("src"), "test","data", dbName); + File db = FileUtil.getFileFromPaths(new File("src"), "test", "data", dbName); if (!db.exists()) { if (log.isWarnEnabled()) { - log.warn("Could not find db at " + db + ", test [" + - testClass + "] is skipped."); + log.warn("Could not find db at " + db + ", test [" + testClass + "] is skipped."); } Assume.assumeTrue(false); } @@ -394,10 +388,6 @@ public class DatabaseResource implements TestRule { } } -// // push back old classLoader -// if (oldClassLoader != null) { -// Thread.currentThread().setContextClassLoader(oldClassLoader); -// } } protected void closeSpring() { @@ -411,46 +401,6 @@ public class DatabaseResource implements TestRule { } } -// public Connection createEmptyDb(String dbDirectory, -// String scriptDbname, -// String dbName, -// Properties p) throws IOException, SQLException { -// File directory = getResourceDirectory(dbDirectory); -// if (log.isInfoEnabled()) { -// log.info("Create new db at " + directory); -// } -// addToDestroy(directory); -// String jdbcUrl = Jdbcs.getJdbcUrl(directory, dbName); -// String user = "SA"; -// String password = ""; -// -// if (p != null) { -// Jdbcs.fillConnectionProperties(p, jdbcUrl, user, password); -// } -// -// File scriptFile = FileUtil.getFileFromPaths(new File("src"), "test", scriptDbname, "allegro.script"); -// -// Preconditions.checkNotNull("Could not find db script in configuration at " + scriptFile); -// Preconditions.checkState(scriptFile.exists(), "Could not find db script at " + scriptFile); -// -// if (log.isInfoEnabled()) { -// log.info("Will use create script: " + scriptFile); -// } -// Connection connection = Jdbcs.createConnection(jdbcUrl, user, password); -// -// if (log.isInfoEnabled()) { -// log.info("Created connection at " + connection.getMetaData().getURL()); -// } -// -// List<String> importScriptSql = getImportScriptSql(scriptFile); -// for (String sql : importScriptSql) { -// PreparedStatement statement = connection.prepareStatement(sql); -// statement.execute(); -// } -// connection.commit(); -// return connection; -// } - protected List<String> getImportScriptSql(File scriptFile) throws IOException { List<String> lines = Files.readLines(scriptFile, Charsets.UTF_8); diff --git a/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask b/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask deleted file mode 100644 index e254bdf..0000000 --- a/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask +++ /dev/null @@ -1,2 +0,0 @@ -fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTaskVesselFeatures -fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTaskVesselRegistrationPeriod \ No newline at end of file diff --git a/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask b/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask deleted file mode 100644 index baa2603..0000000 --- a/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask +++ /dev/null @@ -1,2 +0,0 @@ -fr.ifremer.adagio.core.service.technical.synchro.specific.VesselFeaturesReferentialSynchroSpecificTableTaskImpl -fr.ifremer.adagio.core.service.technical.synchro.specific.VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl \ No newline at end of file diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti.config b/tutti-ui-swing/src/main/filtered-resources/tutti.config index 35201f0..4ca0967 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti.config +++ b/tutti-ui-swing/src/main/filtered-resources/tutti.config @@ -21,6 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### +adagio.version=${adagioVersion} tutti.version=${project.version} tutti.site.url=${project.url} tutti.inceptionYear=${project.inceptionYear} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.