Author: tchemit Date: 2012-08-14 20:47:12 +0200 (Tue, 14 Aug 2012) New Revision: 421 Url: http://forge.codelutin.com/repositories/revision/sammoa/421 Log: updates to last snapshot fo topia and eugene + remove audo directory from configuration (now it is inside the flightstorage) Modified: trunk/pom.xml trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/pom.xml 2012-08-14 18:47:12 UTC (rev 421) @@ -112,9 +112,9 @@ <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> + <eugenePluginVersion>2.5-SNAPSHOT</eugenePluginVersion> <!--<topiaVersion>3.0-SNAPSHOT</topiaVersion>--> - <topiaVersion>2.6.11</topiaVersion> + <topiaVersion>2.6.12-SNAPSHOT</topiaVersion> <!--<hibernateVersion>4.1.3.Final</hibernateVersion>--> <!--<geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>--> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -435,7 +435,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> </plugin> Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-14 18:47:12 UTC (rev 421) @@ -4,12 +4,12 @@ sammoa.config.application.version=Version of the application sammoa.config.audio.directory=Directory where audio files are stored. sammoa.config.background.shape.file= +sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.campaign.id= sammoa.config.data.directory=Main directory where all data are stored. You can use ${data.directory} in other property values (ex\: ${data.directory}/audio). sammoa.config.effort.number= sammoa.config.flight.number= sammoa.config.fly.mode= -sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.gps.check.period=Time in seconds between each GPS capture sammoa.config.gps.device=GPS device port sammoa.config.gps.handler=GpsHandler class \: fr.ulr.sammoa.application.device.gps.GpsHandlerGpylon or fr.ulr.sammoa.application.device.gps.FakeGpsHandler Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-persistence/pom.xml 2012-08-14 18:47:12 UTC (rev 421) @@ -102,7 +102,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> @@ -118,7 +118,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-14 13:09:01 UTC (rev 420) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-14 18:47:12 UTC (rev 421) @@ -264,8 +264,8 @@ helper.addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID); helper.addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY); helper.setOptionCallBack("ui"); - helper.addOption(SammoaConfig.SammoaConfigOption.AUDIO_DIRECTORY); - helper.setOptionCallBack("ui"); +// helper.addOption(SammoaConfig.SammoaConfigOption.CAMPAIGN_DIRECTORY); +// helper.setOptionCallBack("ui"); helper.addOption(SammoaConfig.SammoaConfigOption.FLIGHT_NUMBER); helper.addOption(SammoaConfig.SammoaConfigOption.BACKGROUND_SHAPE_FILE); helper.setOptionCallBack("ui");