February 2013 - Tutti-commits - mailman.cloud.codelutin.com

r486 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: cruise operation protocol
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:54:09 +0100 (Tue, 26 Feb 2013) New Revision: 486 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/486 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -34,7 +34,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-26 17:54:09 UTC (rev 486) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -128,43 +129,7 @@ JAXXContextEntryDef<List<Gear>> SCIENTIFIC_GEARS_CONTEXT_ENTRY = JAXXUtil.newListContextEntryDef("scientificGear"); JAXXContextEntryDef<List<Gear>> FISHING_GEARS_CONTEXT_ENTRY = JAXXUtil.newListContextEntryDef("fishingGear"); - - protected List<Vessel> getVesselList(VesselTypeEnum vesselType) { - List<Vessel> result = Lists.newArrayList(); - switch (vesselType) { - - case ALL: - result.addAll(FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - result.addAll(SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case SCIENTIFIC: - result.addAll(SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case FISHING: - result.addAll(FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - } - return result; - } - - protected List<Gear> getGearList(VesselTypeEnum vesselType) { - List<Gear> result = Lists.newArrayList(); - switch (vesselType) { - - case ALL: - result.addAll(SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - result.addAll(FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case SCIENTIFIC: - result.addAll(SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case FISHING: - result.addAll(FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - } - return result; - } - + @Override public void afterInitUI() { @@ -173,46 +138,71 @@ List<Person> users = persistenceService.getAllPerson(); EditCruiseUIModel model = getModel(); - - model.setVesselType(model.isCreate() ? VesselTypeEnum.SCIENTIFIC : VesselTypeEnum.ALL); - + + final List<Vessel> scientificVesselList = SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui); + final List<Vessel> fishingVesselList = FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui); + final List<Vessel> allVesselList = Lists.newArrayList(); + allVesselList.addAll(scientificVesselList); + allVesselList.addAll(fishingVesselList); + + final List<Gear> scientificGearList = SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui); + final List<Gear> fishingGearList = FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui); + final List<Gear> allGearList = Lists.newArrayList(); + allGearList.addAll(scientificGearList); + allGearList.addAll(fishingGearList); + // Change vessel list and gear list when vessel type changes model.addPropertyChangeListener(EditCruiseUIModel.PROPERTY_VESSEL_TYPE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - EditCruiseUIModel source = (EditCruiseUIModel) evt.getSource(); + VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); - List<Vessel> selectedVessel = source.getVessel(); - List<Gear> selectedGear = source.getGear(); + Predicate<Vessel> vesselPredicate = null; + Predicate<Gear> gearPredicate = null; + + switch (vesselType) { + case FISHING: + vesselPredicate = new Predicate<Vessel>() { - VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); + public boolean apply(Vessel input) { + return !input.isScientificVessel(); + } + }; + gearPredicate = new Predicate<Gear>() { - List<Vessel> newVesselList = getVesselList(vesselType); - List<Gear> newGearList = getGearList(vesselType); + public boolean apply(Gear input) { + return !input.isScientificGear(); + } + }; + break; + + case SCIENTIFIC: + vesselPredicate = new Predicate<Vessel>() { - // compute new selected vessel list - List<Vessel> newSelectedVessel = Lists.newArrayList(); - if (selectedVessel != null) { - newSelectedVessel.addAll(selectedVessel); - } - newSelectedVessel.retainAll(newVesselList); + public boolean apply(Vessel input) { + return input.isScientificVessel(); + } + }; + gearPredicate = new Predicate<Gear>() { - // compute new selected gear list - List<Gear> newSelectedGear = Lists.newArrayList(); - if (selectedGear != null) { - newSelectedGear.addAll(selectedGear); + public boolean apply(Gear input) { + return input.isScientificGear(); + } + }; + break; + } - newSelectedGear.retainAll(newGearList); + ui.getVesselList().getHandler().clearFilters(); + ui.getGearList().getHandler().clearFilters(); + + if (vesselPredicate != null) { + ui.getVesselList().getHandler().addFilter(vesselPredicate); + } + if (gearPredicate != null) { + ui.getGearList().getHandler().addFilter(gearPredicate); + } - // reinit vessel list - ui.getVesselList().getModel().setUniverse(newVesselList); - ui.getVesselList().getModel().setSelected(newSelectedVessel); - - // reinit gear list - ui.getGearList().getModel().setUniverse(newGearList); - ui.getGearList().getModel().setSelected(newSelectedGear); - } }); @@ -224,27 +214,15 @@ persistenceService.getAllCountry(), model.getCountry()); + initBeanList(ui.getVesselList(), - getVesselList(model.getVesselType()), + allVesselList, model.getVessel()); initBeanList(ui.getGearList(), - getGearList(model.getVesselType()), + allGearList, model.getGear()); - //TODO kmorin 20130218 remove this sort when the double lists will be sortable - Collections.sort(users, new Comparator<Person>() { - - public int compare(Person o1, Person o2) { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.getFirstName().compareTo(o2.getFirstName()); - } - }); initBeanList(ui.getHeadOfMissionList(), users, model.getHeadOfMission()); @@ -258,6 +236,8 @@ // if new fishingOperation can already cancel his creation model.setModify(model.isCreate()); + + model.setVesselType(VesselTypeEnum.SCIENTIFIC); registerValidators(validator); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-26 17:54:09 UTC (rev 486) @@ -443,8 +443,8 @@ // update saisissuer selection List<Person> saisisseur = editFishingOperationUIModel.getSaisisseur(); - ui.getSaisisseurList().getModel().setSelected(saisisseur); - + ui.getSaisisseurList().getHandler().setSelected(saisisseur); + // update model empty property editFishingOperationUIModel.setEmpty(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -34,7 +34,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-26 17:54:09 UTC (rev 486) @@ -243,19 +243,6 @@ initUI(ui); List<Person> people = persistenceService.getAllPerson(); - //TODO kmorin 20130218 remove this sort when the double lists will be sortable - Collections.sort(people, new Comparator<Person>() { - - public int compare(Person o1, Person o2) { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.getFirstName().compareTo(o2.getFirstName()); - } - }); initBeanList(ui.getSaisisseurList(), people, model.getSaisisseur()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -28,7 +28,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; }

1 0

r485 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:53:40 +0100 (Tue, 26 Feb 2013) New Revision: 485 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/485 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:52:19 UTC (rev 484) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:53:40 UTC (rev 485) @@ -245,6 +245,7 @@ while (list.hasNext()) { Object[] source = list.next(); Vessel target = loadVessel(source); + target.setScientificVessel(true); result.add(target); } return result; @@ -263,6 +264,7 @@ while (list.hasNext()) { Object[] source = list.next(); Vessel target = loadVessel(source); + target.setScientificVessel(false); result.add(target); } return result; @@ -298,6 +300,7 @@ while (sources.hasNext()) { Object[] source = sources.next(); Gear target = loadGear(source); + target.setScientificGear(true); result.add(target); } return result; @@ -312,6 +315,7 @@ while (sources.hasNext()) { Object[] source = sources.next(); Gear target = loadGear(source); + target.setScientificGear(false); result.add(target); } return result;

1 0

r484 - trunk
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:52:19 +0100 (Tue, 26 Feb 2013) New Revision: 484 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/484 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-26 17:51:59 UTC (rev 483) +++ trunk/pom.xml 2013-02-26 17:52:19 UTC (rev 484) @@ -130,7 +130,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.10</jaxxVersion> + <jaxxVersion>2.5.11-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r483 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:51:59 +0100 (Tue, 26 Feb 2013) New Revision: 483 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/483 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-26 08:42:14 UTC (rev 482) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-26 17:51:59 UTC (rev 483) @@ -27,6 +27,7 @@ tutti.property.multirigAggregation=Numéro de poche tutti.property.name=Nom tutti.property.parameterName=Paramètre +tutti.property.person=Personne tutti.property.program=Série de campagne tutti.property.protocol=Protocol de saisie tutti.property.refTaxCode=Code RefTax

1 0

r482 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service/src/test/java/fr/ifremer/tutti/service/protocol tutti-service/src/test/java/fr/ifremer/tutti/service/referential tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action
by tchemit＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: tchemit Date: 2013-02-26 09:42:14 +0100 (Tue, 26 Feb 2013) New Revision: 482 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/482 Log: use last snapshot of nuiton-utils Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/pom.xml 2013-02-26 08:42:14 UTC (rev 482) @@ -122,7 +122,7 @@  - <nuitonUtilsVersion>2.6.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.10-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-26 08:42:14 UTC (rev 482) @@ -38,8 +38,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -336,33 +334,4 @@ return result; } - public static File getTestSpecificDirectory(Class<?> testClassName, - String methodName, - String classifier, - long timestamp) { - // 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 = SystemUtils.getJavaIoTmpDir(); - - // 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; - } - } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-26 08:42:14 UTC (rev 482) @@ -38,6 +38,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import org.nuiton.util.FileUtil; import java.io.File; import java.util.Map; @@ -115,9 +116,9 @@ @Before public void setUp() throws Exception { - datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), - name.getMethodName(), - null, TIMESTAMP); + datadirectory = FileUtil.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); service = new TuttiProtocolImportExportService() { Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-26 08:42:14 UTC (rev 482) @@ -29,7 +29,6 @@ import com.google.common.io.Files; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -45,6 +44,7 @@ import org.junit.Test; import org.junit.rules.TestName; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.FileUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -247,9 +247,9 @@ @Before public void setUp() throws Exception { - datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), - name.getMethodName(), - null, TIMESTAMP); + datadirectory = FileUtil.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); FileUtils.forceMkdir(datadirectory); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-26 08:42:14 UTC (rev 482) @@ -69,7 +69,7 @@ // change total progressbar max ui.getTaskProgressBar().setMaximum((Integer) evt.getNewValue()); - } else if (ProgressionModel.PROPERTY_MESSAGE.equals(propertyName)) { + } else if (ProgressionModel.PROPERTY_CURRENT.equals(propertyName)) { // change value of progress bar ui.getTaskProgressBar().setValue((Integer) evt.getNewValue());

1 0

r481 - in trunk: src/update tutti-ui-swing
by tchemit＠users.forge.codelutin.com Feb. 25, 2013

Feb. 25, 2013

Author: tchemit Date: 2013-02-25 22:43:56 +0100 (Mon, 25 Feb 2013) New Revision: 481 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/481 Log: refs #2056: [TECH] Am?\195?\169liorer le processus de mise ?\195?\160 jour de l'application (fix update urls) Modified: trunk/src/update/update-tutti.properties trunk/tutti-ui-swing/pom.xml Modified: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties 2013-02-25 20:53:12 UTC (rev 480) +++ trunk/src/update/update-tutti.properties 2013-02-25 21:43:56 UTC (rev 481) @@ -37,14 +37,14 @@ ################################################################################ tutti.version=@projectVersion@ -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/tutti-@projectVersion@-standalone.zip +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip ################################################################################ ### I18n Updates ############################################################### ################################################################################ i18n.version=@projectVersion@ -i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/tutti-@projectVersion@-i18n.zip +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip ################################################################################ ### DB Updates ################################################################# Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-25 20:53:12 UTC (rev 480) +++ trunk/tutti-ui-swing/pom.xml 2013-02-25 21:43:56 UTC (rev 481) @@ -386,9 +386,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>${bundlePrefix}</finalName> - </configuration> <executions> <execution> <id>assembly-standalone</id>

1 0

r480 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Feb. 25, 2013

Feb. 25, 2013

Author: maven-release Date: 2013-02-25 21:53:12 +0100 (Mon, 25 Feb 2013) New Revision: 480 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/480 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-25 20:53:04 UTC (rev 479) +++ trunk/pom.xml 2013-02-25 20:53:12 UTC (rev 480) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-02-25 20:53:04 UTC (rev 479) +++ trunk/tutti-persistence/pom.xml 2013-02-25 20:53:12 UTC (rev 480) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-02-25 20:53:04 UTC (rev 479) +++ trunk/tutti-service/pom.xml 2013-02-25 20:53:12 UTC (rev 480) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-25 20:53:04 UTC (rev 479) +++ trunk/tutti-ui-swing/pom.xml 2013-02-25 20:53:12 UTC (rev 480) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r479 - tags
by maven-release＠users.forge.codelutin.com Feb. 25, 2013

Feb. 25, 2013

Author: maven-release Date: 2013-02-25 21:53:04 +0100 (Mon, 25 Feb 2013) New Revision: 479 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/479 Log: [maven-release-plugin] copy for tag tutti-1.0.1 Added: tags/tutti-1.0.1/

1 0

r478 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Feb. 25, 2013

Feb. 25, 2013

Author: maven-release Date: 2013-02-25 21:52:56 +0100 (Mon, 25 Feb 2013) New Revision: 478 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/478 Log: [maven-release-plugin] prepare release tutti-1.0.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-25 20:50:45 UTC (rev 477) +++ trunk/pom.xml 2013-02-25 20:52:56 UTC (rev 478) @@ -21,9 +21,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> <modules> <module>tutti-persistence</module> @@ -91,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.1 </developerConnection> </scm> @@ -594,18 +592,15 @@ <inherited>false</inherited> <configuration> <tasks> - <echo message="Copy model to site"/> - <copy verbose="true" failonerror="false" overwrite="true" - filtering="true" - todir="${project.build.directory}/update"> + <echo message="Copy model to site" /> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> <filterset> - <filter value="${project.version}" - token="projectVersion"/> - <filter value="${jreVersion}" token="jreVersion"/> - <filter value="${dbVersion}" token="dbVersion"/> + <filter value="${project.version}" token="projectVersion" /> + <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${dbVersion}" token="dbVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties"/> + <include name="update-tutti.properties" /> </fileset> </copy> </tasks> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-02-25 20:50:45 UTC (rev 477) +++ trunk/tutti-persistence/pom.xml 2013-02-25 20:52:56 UTC (rev 478) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-02-25 20:50:45 UTC (rev 477) +++ trunk/tutti-service/pom.xml 2013-02-25 20:52:56 UTC (rev 478) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-25 20:50:45 UTC (rev 477) +++ trunk/tutti-ui-swing/pom.xml 2013-02-25 20:52:56 UTC (rev 478) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r477 - in trunk: . tutti-persistence
by maven-release＠users.forge.codelutin.com Feb. 25, 2013

Feb. 25, 2013

Author: maven-release Date: 2013-02-25 21:50:45 +0100 (Mon, 25 Feb 2013) New Revision: 477 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/477 Log: fix dependencies Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-25 20:44:07 UTC (rev 476) +++ trunk/pom.xml 2013-02-25 20:50:45 UTC (rev 477) @@ -162,7 +162,8 @@ <javassist.version>3.12.1.GA</javassist.version> <hsqldb.version>2.2.9</hsqldb.version> <jdbc.hsqldb.version>1.8.0.7</jdbc.hsqldb.version> - + <jMockVersion>2.5.1</jMockVersion> +  <jreVersion>1.7.10</jreVersion> @@ -367,6 +368,19 @@ <artifactId>yamlbeans</artifactId> <version>1.06</version> </dependency> + + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock</artifactId> + <version>${jMockVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>${jMockVersion}</version> + <scope>test</scope> + </dependency> </dependencies> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-02-25 20:44:07 UTC (rev 476) +++ trunk/tutti-persistence/pom.xml 2013-02-25 20:50:45 UTC (rev 477) @@ -162,14 +162,17 @@ <artifactId>spring-test</artifactId> </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>2.5.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock</artifactId> + </dependency> <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope>

1 0