October 2012 - Sammoa-commits - mailman.cloud.codelutin.com

r616 - in trunk: . sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com 03 Oct '12

03 Oct '12

Author: tchemit Date: 2012-10-03 15:27:59 +0200 (Wed, 03 Oct 2012) New Revision: 616 Url: http://forge.codelutin.com/repositories/revision/sammoa/616 Log: sanityze log config Modified: trunk/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -150,24 +150,24 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -186,24 +186,24 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -211,12 +211,12 @@ <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> <classifier>tests</classifier> - <exclusions> +  </dependency> <dependency> @@ -230,36 +230,36 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -268,12 +268,12 @@ <version>${jaxxVersion}</version> <scope>test</scope> <classifier>tests</classifier> - <exclusions> +  </dependency> <dependency> @@ -288,12 +288,12 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> <version>1.1.1</version> - <exclusions> +  </dependency> <dependency> @@ -319,12 +319,12 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -383,12 +383,12 @@ <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> <scope>compile</scope> - <exclusions> +  </dependency>  Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/sammoa-persistence/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -56,11 +56,6 @@ <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> -  <dependency> <groupId>org.nuiton.topia</groupId> @@ -82,6 +77,12 @@  <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <scope>test</scope> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -190,6 +190,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -203,6 +204,12 @@ <artifactId>logback-core</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> +  <dependency>

1 0

r615 - in trunk: . sammoa-application sammoa-application/src/test/java/fr/ulr/sammoa/application sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map sammoa-application/src/test/resources sammoa-persistence sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence sammoa-persistence/src/test/java/org/nuiton/topia sammoa-ui-swing
by tchemit＠users.forge.codelutin.com 03 Oct '12

03 Oct '12

Author: tchemit Date: 2012-10-03 15:06:22 +0200 (Wed, 03 Oct 2012) New Revision: 615 Url: http://forge.codelutin.com/repositories/revision/sammoa/615 Log: #1543: Tests mal isol?\195?\169s + ne pas exposer des artifacts en test - suppression des configuration de generation de site dans les modules Added: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java Removed: trunk/sammoa-persistence/src/test/java/org/nuiton/topia/tck/ Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java trunk/sammoa-application/src/test/resources/sammoa-test.properties trunk/sammoa-persistence/pom.xml trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java trunk/sammoa-ui-swing/ trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/pom.xml 2012-10-03 13:06:22 UTC (rev 615) @@ -110,7 +110,7 @@  <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.5</eugenePluginVersion> <topiaVersion>2.6.12</topiaVersion> @@ -454,7 +454,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-application/pom.xml 2012-10-03 13:06:22 UTC (rev 615) @@ -133,14 +133,6 @@ </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sammoa-persistence</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> @@ -154,7 +146,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>scan-sources</id> @@ -169,44 +161,4 @@ </plugins> </build> -  -  -  - - <profiles> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - - <reports> - <report>index</report> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> </project> Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2012-10-03 13:06:22 UTC (rev 615) @@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import fr.ulr.sammoa.application.SammoaDatabase; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Observer; import fr.ulr.sammoa.persistence.ObserverDAO; import fr.ulr.sammoa.persistence.SammoaDAOHelper; -import fr.ulr.sammoa.persistence.SammoaDatabase; import fr.ulr.sammoa.persistence.Sector; import fr.ulr.sammoa.persistence.SectorDAO; import fr.ulr.sammoa.persistence.Strate; Copied: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java (from rev 611, trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java) =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java (rev 0) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java 2012-10-03 13:06:22 UTC (rev 615) @@ -0,0 +1,272 @@ +/* + * #%L + * SAMMOA :: Application + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ulr.sammoa.application; + +import com.google.common.base.Throwables; +import fr.ulr.sammoa.persistence.Campaign; +import fr.ulr.sammoa.persistence.CampaignDAO; +import fr.ulr.sammoa.persistence.PersistenceException; +import fr.ulr.sammoa.persistence.Region; +import fr.ulr.sammoa.persistence.RegionDAO; +import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.SammoaPersistence; +import org.apache.commons.lang3.StringUtils; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + * Created: 06/06/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class SammoaDatabase extends TestWatcher { + + /** Logger. */ + private static final Logger log = + LoggerFactory.getLogger(SammoaDatabase.class); + + protected SammoaPersistence persistence; + + protected long autoCommitDelay; + + /** A time-stamp, allow to make multiple build and keep the tests data. */ + public static final String TIMESTAMP = String.valueOf(System.nanoTime()); + + protected File testBasedir; + + protected Properties dbConfiguration; + + protected TopiaContext rootCtxt; + + protected Description description; + + protected final String configurationPath; + + protected final String classifier; + + public SammoaDatabase(String configurationPath, long autoCommitDelay) { + this.configurationPath = configurationPath; + this.classifier = ""; + this.autoCommitDelay = autoCommitDelay; + } + + /** + * Obtain all types persisted in this db. + * + * @return all persisted types in this db. + * @since 3.0 + */ + protected Class<? extends TopiaEntity>[] getImplementationClasses() { + return SammoaDAOHelper.getImplementationClasses(); + } + + @Override + protected void starting(Description description) { + + this.description = description; + + // get test directory + testBasedir = getTestSpecificDirectory( + description.getTestClass(), + description.getMethodName(), + classifier); + + if (log.isDebugEnabled()) { + log.debug("testBasedir = " + testBasedir); + } + + // create the root context + try { + + dbConfiguration = newDbConfiguration(configurationPath); + + // make sure we always use a different directory + + String dbPath = new File(testBasedir, "db").getAbsolutePath(); + + String jdbcUrl = "jdbc:h2:file:" + dbPath; + + if (log.isInfoEnabled()) { + log.info("Use " + jdbcUrl); + } + + dbConfiguration.setProperty( + TopiaContextFactory.CONFIG_URL, jdbcUrl); + + onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); + + rootCtxt = TopiaContextFactory.getContext(dbConfiguration); + + onRootCtxtCreate(rootCtxt); + + } catch (Exception e) { + throw new IllegalStateException( + "Could not start db at " + testBasedir, e); + } + } + + @Override + public void finished(Description description) { + + if (rootCtxt != null && !rootCtxt.isClosed()) { + try { + rootCtxt.closeContext(); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Could not close topia root context", e); + } + } + } + rootCtxt = null; + dbConfiguration = null; + } + + protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { + persistence = new SammoaPersistence(); + try { + persistence.open(configuration, autoCommitDelay); + } catch (PersistenceException ex) { + throw Throwables.propagate(ex); + } + } + + protected void onRootCtxtCreate(TopiaContext rootCtxt) { + persistence.setRootContext(rootCtxt); + } + + public TopiaContext beginTransaction() throws TopiaException { + return persistence.beginTransaction(); + } + + public void endTransaction(TopiaContext transaction) { + persistence.endTransaction(transaction); + } + + public SammoaPersistence getPersistence() { + return persistence; + } + + public Campaign createCampaign(String code, String regionCode) throws TopiaException { + + TopiaContext transaction = beginTransaction(); + + RegionDAO regionDAO = SammoaDAOHelper.getRegionDAO(transaction); + Region region = regionDAO.createByNaturalId(regionCode); + + CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(transaction); + Campaign result = campaignDAO.createByNaturalId(code, region); + + transaction.commitTransaction(); + endTransaction(transaction); + + return result; + } + + public File getTestBasedir() { + return testBasedir; + } + + public TopiaContext getRootCtxt() { + return rootCtxt; + } + + public Properties getDbConfiguration() { + return dbConfiguration; + } + + public Description getDescription() { + return description; + } + + protected Properties newDbConfiguration(String configurationPath) throws IOException { + + Properties result = new Properties(); + InputStream stream = + getClass().getResourceAsStream(configurationPath); + + try { + result.load(stream); + } finally { + stream.close(); + } + result.setProperty( + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + getImplementationClassesAsString()); + + return result; + } + + protected final String getImplementationClassesAsString() { + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + } + + public static File getTestSpecificDirectory(Class<?> testClassName, + String methodName) { + return getTestSpecificDirectory(testClassName, methodName, ""); + } + + public static File getTestSpecificDirectory(Class<?> testClassName, + String methodName, + String classifier) { + // Trying to look for the temporary folder to store data for the test + String tempDirPath = System.getProperty("java.io.tmpdir"); + if (tempDirPath == null) { + // can this really occur ? + tempDirPath = ""; + if (log.isWarnEnabled()) { + log.warn("'\"java.io.tmpdir\" not defined"); + } + } + File tempDirFile = new File(tempDirPath); + + // create the directory to store database data + String dataBasePath = testClassName.getName() + + File.separator // a directory with the test class name + + methodName; // a sub-directory with the method name + + if (StringUtils.isNotBlank(classifier)) { + dataBasePath += classifier; + } + dataBasePath += '_' + + TIMESTAMP; // and a timestamp + File databaseFile = new File(tempDirFile, dataBasePath); + return databaseFile; + } +} Property changes on: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java 2012-10-03 13:06:22 UTC (rev 615) @@ -23,6 +23,7 @@ * #L% */ +import fr.ulr.sammoa.application.SammoaDatabase; import fr.ulr.sammoa.application.SammoaConfig; import fr.ulr.sammoa.application.SammoaConfigMock; import fr.ulr.sammoa.application.SammoaContext; @@ -30,7 +31,6 @@ import fr.ulr.sammoa.persistence.Observer; import fr.ulr.sammoa.persistence.ObserverDAO; import fr.ulr.sammoa.persistence.SammoaDAOHelper; -import fr.ulr.sammoa.persistence.SammoaDatabase; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-10-03 13:06:22 UTC (rev 615) @@ -28,6 +28,7 @@ import fr.ulr.sammoa.application.SammoaConfig; import fr.ulr.sammoa.application.SammoaConfigMock; import fr.ulr.sammoa.application.SammoaContext; +import fr.ulr.sammoa.application.SammoaDatabase; import fr.ulr.sammoa.application.io.input.map.DbfImport; import fr.ulr.sammoa.application.io.input.map.DoubleToIntegerValueParser; import fr.ulr.sammoa.application.io.output.map.DbfTableModelBuilder; @@ -43,7 +44,6 @@ import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.RegionImpl; import fr.ulr.sammoa.persistence.SammoaDAOHelper; -import fr.ulr.sammoa.persistence.SammoaDatabase; import junit.framework.Assert; import org.junit.After; import org.junit.Before; Modified: trunk/sammoa-application/src/test/resources/sammoa-test.properties =================================================================== --- trunk/sammoa-application/src/test/resources/sammoa-test.properties 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-application/src/test/resources/sammoa-test.properties 2012-10-03 13:06:22 UTC (rev 615) @@ -40,4 +40,4 @@ hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider #data directory -sammoa.dataDirectory=target/sammoa-data +sammoa.data.directory=target/sammoa-data Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-persistence/pom.xml 2012-10-03 13:06:22 UTC (rev 615) @@ -105,17 +105,6 @@ <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <executions> @@ -149,44 +138,4 @@ </plugins> </build> -  -  -  - - <profiles> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - - <reports> - <report>index</report> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> </project> Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2012-10-03 13:06:22 UTC (rev 615) @@ -1,6 +1,6 @@ /* * #%L - * SAMMOA :: Application + * SAMMOA :: Persistence * * $Id$ * $HeadURL$ @@ -25,12 +25,19 @@ package fr.ulr.sammoa.persistence; import com.google.common.base.Throwables; +import org.apache.commons.lang3.StringUtils; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.tck.TopiaDatabase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.Properties; /** @@ -38,23 +45,108 @@ * * @author fdesbois <desbois(a)codelutin.com> */ -public class SammoaDatabase extends TopiaDatabase { +public class SammoaDatabase extends TestWatcher { + /** Logger. */ + private static final Logger log = + LoggerFactory.getLogger(SammoaDatabase.class); + protected SammoaPersistence persistence; protected long autoCommitDelay; + /** A time-stamp, allow to make multiple build and keep the tests data. */ + public static final String TIMESTAMP = String.valueOf(System.nanoTime()); + + protected File testBasedir; + + protected Properties dbConfiguration; + + protected TopiaContext rootCtxt; + + protected Description description; + + protected final String configurationPath; + + protected final String classifier; + public SammoaDatabase(String configurationPath, long autoCommitDelay) { - super(configurationPath); + this.configurationPath = configurationPath; + this.classifier = ""; this.autoCommitDelay = autoCommitDelay; } - @Override + /** + * Obtain all types persisted in this db. + * + * @return all persisted types in this db. + * @since 3.0 + */ protected Class<? extends TopiaEntity>[] getImplementationClasses() { return SammoaDAOHelper.getImplementationClasses(); } @Override + protected void starting(Description description) { + + this.description = description; + + // get test directory + testBasedir = getTestSpecificDirectory( + description.getTestClass(), + description.getMethodName(), + classifier); + + if (log.isDebugEnabled()) { + log.debug("testBasedir = " + testBasedir); + } + + // create the root context + try { + + dbConfiguration = newDbConfiguration(configurationPath); + + // make sure we always use a different directory + + String dbPath = new File(testBasedir, "db").getAbsolutePath(); + + String jdbcUrl = "jdbc:h2:file:" + dbPath; + + if (log.isInfoEnabled()) { + log.info("Use " + jdbcUrl); + } + + dbConfiguration.setProperty( + TopiaContextFactory.CONFIG_URL, jdbcUrl); + + onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); + + rootCtxt = TopiaContextFactory.getContext(dbConfiguration); + + onRootCtxtCreate(rootCtxt); + + } catch (Exception e) { + throw new IllegalStateException( + "Could not start db at " + testBasedir, e); + } + } + + @Override + public void finished(Description description) { + + if (rootCtxt != null && !rootCtxt.isClosed()) { + try { + rootCtxt.closeContext(); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Could not close topia root context", e); + } + } + } + rootCtxt = null; + dbConfiguration = null; + } + protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { persistence = new SammoaPersistence(); try { @@ -64,12 +156,10 @@ } } - @Override protected void onRootCtxtCreate(TopiaContext rootCtxt) { persistence.setRootContext(rootCtxt); } - @Override public TopiaContext beginTransaction() throws TopiaException { return persistence.beginTransaction(); } @@ -97,4 +187,79 @@ return result; } -} + + public File getTestBasedir() { + return testBasedir; + } + + public TopiaContext getRootCtxt() { + return rootCtxt; + } + + public Properties getDbConfiguration() { + return dbConfiguration; + } + + public Description getDescription() { + return description; + } + + protected Properties newDbConfiguration(String configurationPath) throws IOException { + + Properties result = new Properties(); + InputStream stream = + getClass().getResourceAsStream(configurationPath); + + try { + result.load(stream); + } finally { + stream.close(); + } + result.setProperty( + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + getImplementationClassesAsString()); + + return result; + } + + protected final String getImplementationClassesAsString() { + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + } + + public static File getTestSpecificDirectory(Class<?> testClassName, + String methodName) { + return getTestSpecificDirectory(testClassName, methodName, ""); + } + + public static File getTestSpecificDirectory(Class<?> testClassName, + String methodName, + String classifier) { + // Trying to look for the temporary folder to store data for the test + String tempDirPath = System.getProperty("java.io.tmpdir"); + if (tempDirPath == null) { + // can this really occur ? + tempDirPath = ""; + if (log.isWarnEnabled()) { + log.warn("'\"java.io.tmpdir\" not defined"); + } + } + File tempDirFile = new File(tempDirPath); + + // create the directory to store database data + String dataBasePath = testClassName.getName() + + File.separator // a directory with the test class name + + methodName; // a sub-directory with the method name + + if (StringUtils.isNotBlank(classifier)) { + dataBasePath += classifier; + } + dataBasePath += '_' + + TIMESTAMP; // and a timestamp + File databaseFile = new File(tempDirFile, dataBasePath); + return databaseFile; + } +} \ No newline at end of file Property changes on: trunk/sammoa-ui-swing ___________________________________________________________________ Modified: svn:ignore - target *.iml *.iws *.ipr .settings .classpath .project + target *.iml *.iws *.ipr .settings .classpath .project *.log Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-03 10:38:43 UTC (rev 614) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:06:22 UTC (rev 615) @@ -260,7 +260,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>scan-sources</id> @@ -358,41 +358,6 @@ <profiles> <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - - <reports> - <report>index</report> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - </profile> - - <profile> <id>assembly-profile</id> <activation> <property> @@ -424,7 +389,7 @@ </build> </profile> - <profile> +  <jnlpExtensions> <jnlpExtension> <name>jxlayer</name> @@ -519,6 +483,6 @@ </plugin> </plugins> </reporting> - </profile> + </profile--> </profiles> </project>

1 0

r614 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/main/resources/META-INF/services sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by tchemit＠users.forge.codelutin.com 03 Oct '12

03 Oct '12

Author: tchemit Date: 2012-10-03 12:38:43 +0200 (Wed, 03 Oct 2012) New Revision: 614 Url: http://forge.codelutin.com/repositories/revision/sammoa/614 Log: fix svn properties and license headers Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java trunk/sammoa-application/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/ValidModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/DeletedRowHighlightPredicate.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SelectionModelAdapter.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidRowHighlightPredicate.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java 2012-10-03 10:38:43 UTC (rev 614) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/sammoa-application/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIHandler.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIHandler.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/ValidModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/ValidModel.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/ValidModel.java 2012-10-03 10:38:43 UTC (rev 614) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/DeletedRowHighlightPredicate.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/DeletedRowHighlightPredicate.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/DeletedRowHighlightPredicate.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SelectionModelAdapter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SelectionModelAdapter.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SelectionModelAdapter.java 2012-10-03 10:38:43 UTC (rev 614) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java 2012-10-03 10:38:43 UTC (rev 614) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidRowHighlightPredicate.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidRowHighlightPredicate.java 2012-10-03 10:24:38 UTC (rev 613) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidRowHighlightPredicate.java 2012-10-03 10:38:43 UTC (rev 614) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %%

1 0

r613 - in trunk: . src/site
by tchemit＠users.forge.codelutin.com 03 Oct '12

03 Oct '12

Author: tchemit Date: 2012-10-03 12:24:38 +0200 (Wed, 03 Oct 2012) New Revision: 613 Url: http://forge.codelutin.com/repositories/revision/sammoa/613 Log: fixes #1542: Certains liens dans le menu du site sont morts Modified: trunk/pom.xml trunk/src/site/site.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 10:24:19 UTC (rev 612) +++ trunk/pom.xml 2012-10-03 10:24:38 UTC (rev 613) @@ -130,6 +130,9 @@ <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> +  + <relativizeDecorationLinks>false</relativizeDecorationLinks> +  <license.organizationName> UMS 3462, Code Lutin Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2012-10-03 10:24:19 UTC (rev 612) +++ trunk/src/site/site.xml 2012-10-03 10:24:38 UTC (rev 613) @@ -23,8 +23,6 @@ #L% --> - - <project name="${project.name}"> <skin> @@ -45,7 +43,6 @@ <bannerLeft> <name>${project.name}</name> -  <href>./index.html</href> </bannerLeft> @@ -80,6 +77,16 @@ </poweredBy> <body> + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <links> <item name="Forge" href="http://forge.codelutin.com"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -110,11 +117,7 @@ <footer> - <script type="text/javascript" - src="http://maven-site.forge.codelutin.com/public/js/maven-site-forge.codelutin.…"> - </script> - - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}'

1 0

r612 - trunk/sammoa-ui-swing
by tchemit＠users.forge.codelutin.com 03 Oct '12

03 Oct '12

Author: tchemit Date: 2012-10-03 12:24:19 +0200 (Wed, 03 Oct 2012) New Revision: 612 Url: http://forge.codelutin.com/repositories/revision/sammoa/612 Log: fixes #1541: L'application ne d?\195?\169marre pas Modified: trunk/sammoa-ui-swing/pom.xml Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-09-28 12:37:07 UTC (rev 611) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 10:24:19 UTC (rev 612) @@ -323,7 +323,7 @@ <goals> <goal>copy-dependencies</goal> </goals> - <phase>package</phase> + <phase>process-classes</phase> <configuration> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots>

1 0