Author: tchemit Date: 2011-11-25 00:42:22 +0100 (Fri, 25 Nov 2011) New Revision: 117 Url: http://forge.codelutin.com/repositories/revision/echobase/117 Log: - do not expose entities module as test just to obtain basedir :( - avoid to create a class for one method - do NOT use a none hand build entity types for replication - optimize dependencies Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java Modified: trunk/echobase-entities/pom.xml trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java trunk/echobase-ui/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -54,12 +54,12 @@ <!--dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - </dependency> + </dependency--> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - </dependency--> + </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -132,19 +132,8 @@ <build> <plugins> + <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <configuration> @@ -212,13 +201,6 @@ </plugins> - <testResources> - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - </build> </project> Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -23,13 +23,14 @@ */ package fr.ifremer.echobase.entities; +import com.google.common.collect.Lists; import org.nuiton.topia.persistence.TopiaEntity; import java.util.ArrayList; import java.util.List; /** - * Utility method for enities + * Utility method for entities. * * @author sletellier <letellier@codelutin.com> * @since 0.2 @@ -37,6 +38,77 @@ public class EntitiesUtil { /** + * @return the entity types of reference in correct order for replication + * purpose. + */ + public static EchoBaseEntityEnum[] getReferenceTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Voyage); + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.EchotypeDepthStratum); + result.add(EchoBaseEntityEnum.Transit); + result.add(EchoBaseEntityEnum.TransitVessel); + result.add(EchoBaseEntityEnum.Transect); + result.add(EchoBaseEntityEnum.TransectAcousticInstrument); + result.add(EchoBaseEntityEnum.DataAcquisition); + result.add(EchoBaseEntityEnum.DataProcessing); + result.add(EchoBaseEntityEnum.Cell); + result.add(EchoBaseEntityEnum.Data); + result.add(EchoBaseEntityEnum.Operation); + result.add(EchoBaseEntityEnum.OperationMetadataValue); + result.add(EchoBaseEntityEnum.OperationMeasurementMetadataValue); + result.add(EchoBaseEntityEnum.Individual); + result.add(EchoBaseEntityEnum.OperationGearMetadataValue); + result.add(EchoBaseEntityEnum.Sample); + result.add(EchoBaseEntityEnum.SampleAge); + result.add(EchoBaseEntityEnum.SampleLength); + result.add(EchoBaseEntityEnum.SampleAggregation); + result.add(EchoBaseEntityEnum.AggregationLevel); + + return result.toArray(new EchoBaseEntityEnum[result.size()]); + } + + /** + * @return the entity types of data in correct order for replication + * purpose. + */ + public static EchoBaseEntityEnum[] getDataTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.AcousticInstrument); + result.add(EchoBaseEntityEnum.AreaOfOperation); + result.add(EchoBaseEntityEnum.Calibration); + result.add(EchoBaseEntityEnum.Category); + result.add(EchoBaseEntityEnum.CategoryMeaning); + result.add(EchoBaseEntityEnum.CategoryRef); + result.add(EchoBaseEntityEnum.CategoryType); + result.add(EchoBaseEntityEnum.CellMethod); + result.add(EchoBaseEntityEnum.CellType); + result.add(EchoBaseEntityEnum.DataMetadata); + result.add(EchoBaseEntityEnum.DataMetadataName); + result.add(EchoBaseEntityEnum.DataQuality); + result.add(EchoBaseEntityEnum.DepthStratum); + result.add(EchoBaseEntityEnum.DepthStratumType); + result.add(EchoBaseEntityEnum.Gear); + result.add(EchoBaseEntityEnum.GearMetadata); + result.add(EchoBaseEntityEnum.GearMetadataValue); + result.add(EchoBaseEntityEnum.GearType); + result.add(EchoBaseEntityEnum.Impacte); + result.add(EchoBaseEntityEnum.Localisation); + result.add(EchoBaseEntityEnum.MeasurementMetadata); + result.add(EchoBaseEntityEnum.MeasureType); + result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.OperationMetadata); + result.add(EchoBaseEntityEnum.OperationType); + result.add(EchoBaseEntityEnum.ReferenceDatum); + result.add(EchoBaseEntityEnum.ReferencingMethod); + result.add(EchoBaseEntityEnum.Species); + result.add(EchoBaseEntityEnum.Station); + result.add(EchoBaseEntityEnum.Vessel); + return result.toArray(new EchoBaseEntityEnum[result.size()]); + } + + /** * Used to get all contract of a package * * @param entitiesPackage package contening desired entities Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,45 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, 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% - */ -package fr.ifremer.echobase.entities.data; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EntitiesUtil; - -/** - * Data method utility - * - * @author sletellier <letellier@codelutin.com> - * @since 0.2 - */ -public class DataUtil { - - /** - * Used to get all contract of a data package - * - * @return contracts in package data - */ - public static EchoBaseEntityEnum[] getDataContracts() { - return EntitiesUtil.getContractsOf(DataUtil.class.getPackage()); - } -} Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,45 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, 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% - */ -package fr.ifremer.echobase.entities.references; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EntitiesUtil; - -/** - * References method utility - * - * @author sletellier <letellier@codelutin.com> - * @since 0.2 - */ -public class ReferencesUtil { - - /** - * Used to get all contract of a referenciel package - * - * @return contracts in package referenciel - */ - public static EchoBaseEntityEnum[] getReferencielContracts() { - return EntitiesUtil.getContractsOf(ReferencesUtil.class.getPackage()); - } -} Deleted: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,54 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, 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% - */ -package fr.ifremer.echobase; - -import org.apache.commons.io.FileUtils; -import org.junit.Ignore; - -import java.io.File; - -/** - * Utility methods for tests - * - * @author sletellier <letellier@codelutin.com> - * @since 0.2 - */ -@Ignore -public class TestHelper { - - protected static File basedir; - - public static File getBasedir() { - if (basedir == null) { -// String tmp = System.getProperty("basedir"); -// if (tmp == null) { -// tmp = new File("").getAbsolutePath(); -// } -// basedir = new File(tmp); - basedir = FileUtils.getTempDirectory(); - } - return basedir; - } - -} Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -24,14 +24,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>echobase-entities</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <!--dependency> <groupId>fr.ird</groupId> <artifactId>msaccess-importer</artifactId> @@ -51,10 +43,10 @@ <artifactId>nuiton-csv</artifactId> </dependency> - <!--dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - </dependency--> + </dependency> <!-- comons dependencies --> @@ -68,10 +60,10 @@ <artifactId>xwork-core</artifactId> </dependency--> - <!--dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - </dependency--> + </dependency> <dependency> <groupId>commons-logging</groupId> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-24 23:42:22 UTC (rev 117) @@ -28,9 +28,8 @@ import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.entities.data.DataUtil; -import fr.ifremer.echobase.entities.references.ReferencesUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -251,7 +250,7 @@ protected void replicateVoyages(TopiaContext topiaContextDest, String... voyagesIds) throws TopiaException { TopiaReplicationService service = getTransaction().getService(TopiaReplicationService.class); - ReplicationModel replicationModel = service.prepare(DataUtil.getDataContracts(), true, voyagesIds); + ReplicationModel replicationModel = service.prepare(EntitiesUtil.getDataTypes(), true, voyagesIds); try { service.doReplicate(replicationModel, topiaContextDest); } catch (Exception eee) { @@ -263,7 +262,7 @@ protected void replicateReferentiel(TopiaContext topiaContextDest) throws TopiaException { // Get all referenciel contracts - EchoBaseEntityEnum[] referencielClass = ReferencesUtil.getReferencielContracts(); + EchoBaseEntityEnum[] referencielClass = EntitiesUtil.getReferenceTypes(); TopiaReplicationService service = getTransaction().getService(TopiaReplicationService.class); ReplicationModel replicationModel = service.prepareForAll(referencielClass); try { Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java (from rev 116, trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:42:22 UTC (rev 117) @@ -0,0 +1,56 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, 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% + */ +package fr.ifremer.echobase; + +import org.apache.commons.io.FileUtils; +import org.junit.Ignore; + +import java.io.File; + +/** + * Utility methods for tests + * + * @author sletellier <letellier@codelutin.com> + * @since 0.2 + */ +@Ignore +public class TestHelper { + + protected static File basedir; + + public static File getBasedir() { + //FIXME : No we do not want to go in tmp directory :( We want to stay + // inside of the project. So a mvn clean will remove all tests data. + if (basedir == null) { +// String tmp = System.getProperty("basedir"); +// if (tmp == null) { +// tmp = new File("").getAbsolutePath(); +// } +// basedir = new File(tmp); + basedir = FileUtils.getTempDirectory(); + } + return basedir; + } + +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java 2011-11-24 23:42:22 UTC (rev 117) @@ -47,7 +47,8 @@ public class MockEntityVisitorCreator implements EntityVisitor { /** Logger. */ - private static final Log log = LogFactory.getLog(MockEntityVisitorCreator.class); + private static final Log log = + LogFactory.getLog(MockEntityVisitorCreator.class); protected TopiaContext transaction; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java 2011-11-24 23:42:22 UTC (rev 117) @@ -57,7 +57,6 @@ @After public void after() throws TopiaException { if (transaction != null && !transaction.isClosed()) { - transaction.rollbackTransaction(); transaction.closeContext(); } } Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-ui/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -135,6 +135,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency>