January 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1536 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 18:40:19 +0100 (Wed, 29 Jan 2014) New Revision: 1536 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1536 Log: fix icon for psion import Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-29 17:37:18 UTC (rev 1535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-29 17:40:19 UTC (rev 1536) @@ -92,9 +92,6 @@ SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); List<String> missingCategories = Lists.newArrayList(); -// if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_SIZE_CATEGORY)) { -// missingCategories.add("<li>" + persistenceService.getSizeCategoryCaracteristic().getParameterName() + "</li>"); -// } if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_SEX)) { missingCategories.add("<li>" + persistenceService.getSexCaracteristic().getParameterName() + "</li>"); } @@ -111,24 +108,6 @@ UIManager.getIcon("error") ); } -// if (result) { -// -// SpeciesBatchUIModel speciesBatchUIModel = getUI().getModel(); -// if (speciesBatchUIModel.getRowCount() > 0) { -// String htmlMessage = String.format( -// AbstractTuttiUIHandler.CONFIRMATION_FORMAT, -// _("tutti.editSpeciesBatch.action.importPsion.existingData.message"), -// _("tutti.editSpeciesBatch.action.importPsion.existingData.help")); -// -// int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), -// htmlMessage, -// _("tutti.editSpeciesBatch.action.importPsion.existingData.title"), -// JOptionPane.OK_CANCEL_OPTION, -// JOptionPane.WARNING_MESSAGE); -// -// result = answer == JOptionPane.OK_OPTION; -// } -// } if (result) { // choose file to import

1 0

r1535 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 18:37:18 +0100 (Wed, 29 Jan 2014) New Revision: 1535 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1535 Log: fixes #4130: [TECH] S?\195?\169curiser les acc?\195?\168s au site de donn?\195?\169es Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-29 14:37:14 UTC (rev 1534) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-29 17:37:18 UTC (rev 1535) @@ -31,7 +31,7 @@ <script><![CDATA[ public LoginUI(TuttiUIContext context) { - super(context.getMainUI()); + super(context.getExistingActionUIWhenMainUINotNull()); TuttiUIUtil.setApplicationContext(this, context); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-29 14:37:14 UTC (rev 1534) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-29 17:37:18 UTC (rev 1535) @@ -24,11 +24,11 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.content.MainUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; +import java.awt.Container; + import static org.nuiton.i18n.I18n._; /** @@ -59,19 +59,10 @@ ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); ui.pack(); - MainUI mainUI = TuttiUIUtil.getApplicationContext(ui).getMainUI(); - if (mainUI != null) { - - // we need to wait until the optional action ui is launch - try { - Thread.sleep(1001); - } catch (InterruptedException e) { - //ignore it - } + Container parent = ui.getParent(); + if (parent != null) { + SwingUtil.center(parent, ui); } - if (mainUI != null) { - SwingUtil.center(mainUI, ui); - } ui.setVisible(true); }

1 0

r1534 - trunk/tutti-ui-swing/src/main/resources/icons
by kmorin＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: kmorin Date: 2014-01-29 15:37:14 +0100 (Wed, 29 Jan 2014) New Revision: 1534 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1534 Log: bluetooth disabled icon Modified: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png Modified: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png =================================================================== (Binary files differ)

1 0

r1533 - trunk/tutti-ui-swing/src/main/resources/icons
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 15:28:30 +0100 (Wed, 29 Jan 2014) New Revision: 1533 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1533 Log: add new icons Added: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-up.png trunk/tutti-ui-swing/src/main/resources/icons/action-psion-import.png Added: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-up.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-up.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/tutti-ui-swing/src/main/resources/icons/action-psion-import.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-psion-import.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r1532 - in trunk/tutti-ichtyometer: . src/main/java/fr/ifremer/tutti/ichtyometer/feed src/main/resources
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 06:32:54 +0100 (Wed, 29 Jan 2014) New Revision: 1532 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1532 Log: remove i18n from ichyometer module + improve some api (refs #3875: Import des mensurations en continue depuis un ictyom?\195?\168tre) Removed: trunk/tutti-ichtyometer/src/main/resources/i18n/ Modified: trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-29 03:26:12 UTC (rev 1531) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-29 05:32:54 UTC (rev 1532) @@ -52,12 +52,6 @@ <artifactId>bluecove-gpl</artifactId> </dependency> -  -  -  <dependency> <groupId>com.google.guava</groupId> @@ -98,20 +92,6 @@ <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-29 03:26:12 UTC (rev 1531) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-29 05:32:54 UTC (rev 1532) @@ -32,6 +32,7 @@ import javax.microedition.io.StreamConnection; import javax.swing.event.EventListenerList; +import java.io.Closeable; import java.io.DataInputStream; import java.io.IOException; @@ -43,7 +44,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 3.1 */ -public class FeedReader { +public class FeedReader implements Closeable { /** Logger. */ private static final Log log = LogFactory.getLog(FeedReader.class); @@ -93,7 +94,8 @@ fireReaderStart(e); } - public void stop() throws IOException { + @Override + public void close() throws IOException { try { if (readingRunnable != null) { @@ -110,9 +112,7 @@ } finally { - if (client != null) { - Closeables.close(client, true); - } + Closeables.close(client, true); FeedReaderEvent e = new FeedReaderEvent(this); fireReaderStop(e);

1 0

Build failed in Jenkins: tutti #3
by admin+ci-forge.codelutin.com＠codelutin.com 29 Jan '14

29 Jan '14

See <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/3/changes> Changes: [Tony CHEMIT] fixes #4257: Ajout de message d'erreur si une mise à jour ne se déroule pas bien refs #4130: [TECH] Sécuriser les accès au site de données ------------------------------------------ [...truncated 272 lines...] [mkdir] Created dir: <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/t…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 30 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ tutti-service --- [INFO] Compiling 18 source files to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/t…> [WARNING] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ tutti-service --- [INFO] Surefire report directory: <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/t…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.tutti.service.BeanValidatorDetectorTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.686 sec - in fr.ifremer.tutti.service.BeanValidatorDetectorTest Running fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-01-29 03:57:29,395 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-01-29 03:57:29,430 35 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.catches.WeightComputingServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.043 sec - in fr.ifremer.tutti.service.catches.WeightComputingServiceTest Running fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-01-29 03:57:29,434 39 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-01-29 03:57:29,442 47 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.008 sec - in fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest Running fr.ifremer.tutti.service.UpdateSchemaTest 2014-01-29 03:57:29,443 48 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.UpdateSchemaTest 2014-01-29 03:57:29,449 54 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS_old.properties 2014-01-29 03:57:29,449 54 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS_old, test [class fr.ifremer.tutti.service.UpdateSchemaTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.UpdateSchemaTest Running fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-01-29 03:57:29,451 56 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-01-29 03:57:29,457 62 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 03:57:29,457 62 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.016 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest Running fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-01-29 03:57:29,458 63 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-01-29 03:57:29,463 68 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 03:57:29,463 68 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest Running fr.ifremer.tutti.service.ValidationServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.799 sec - in fr.ifremer.tutti.service.ValidationServiceTest Running fr.ifremer.tutti.service.DecoratorServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.202 sec - in fr.ifremer.tutti.service.DecoratorServiceTest Running fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-01-29 03:57:30,474 1079 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-01-29 03:57:30,476 1081 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 03:57:30,477 1082 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.015 sec - in fr.ifremer.tutti.service.psionimport.PsionImportServiceTest Running fr.ifremer.tutti.service.report.ReportServiceTest 2014-01-29 03:57:30,478 1083 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.report.ReportServiceTest 2014-01-29 03:57:30,482 1087 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.report.ReportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.report.ReportServiceTest Running fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-01-29 03:57:30,484 1089 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-01-29 03:57:30,487 1092 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-01-29 03:57:30,488 1093 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest Running fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-01-29 03:57:30,490 1095 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-01-29 03:57:30,494 1099 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-01-29 03:57:30,495 1100 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-01-29 03:57:30,498 1103 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-01-29 03:57:30,501 1106 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-01-29 03:57:30,501 1106 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-01-29 03:57:30,505 1110 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.003 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportService2Test Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-01-29 03:57:30,506 1111 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-01-29 03:57:30,509 1114 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.003 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest Running fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-01-29 03:57:30,510 1115 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-01-29 03:57:30,514 1119 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/s…,> test [class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest Results : Tests run: 25, Failures: 0, Errors: 0, Skipped: 14 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/t…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 40 modified jaxx file(s). [WARNING] JAXX detects 2 warnings : <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'title' in component 'dialog' : [_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'text' in component 'message' : [_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())] [INFO] Generated 40 file(s) in 19.596s [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Merge help ids to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Use input file: <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 6/1569 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1571/1576 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 12 i18n artifacts for locale fr_FR stored in <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] collected 12 i18n artifacts for locale en_GB stored in <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 4/2116 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1940/2124 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Missing file <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> is up-to-date. [INFO] Writing third-party file to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Writing bundled third-party file to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] Will attach third party file from <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 98 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 319 source files to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…>:[3,1] class, interface, or enum expected [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [13.497s] [INFO] Tutti :: Persistence .............................. SUCCESS [29.283s] [INFO] Tutti :: Service .................................. SUCCESS [45.444s] [INFO] Tutti :: UI ....................................... FAILURE [46.019s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 2:18.566s [INFO] Finished at: Wed Jan 29 03:58:17 CET 2014 [INFO] Final Memory: 115M/358M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure [ERROR] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…>:[3,1] class, interface, or enum expected [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…>:[3,1] class, interface, or enum expected at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/…>:[3,1] class, interface, or enum expected at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-ui-swing Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com channel stopped

2 2

Build failed in Jenkins: tutti » Tutti :: UI #3
by admin+ci-forge.codelutin.com＠codelutin.com 29 Jan '14

29 Jan '14

See <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> Changes: [Tony CHEMIT] fixes #4257: Ajout de message d'erreur si une mise à jour ne se déroule pas bien refs #4130: [TECH] Sécuriser les accès au site de données ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 40 modified jaxx file(s). [WARNING] JAXX detects 2 warnings : <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'title' in component 'dialog' : [_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'text' in component 'message' : [_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())] [INFO] Generated 40 file(s) in 19.596s [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Merge help ids to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Use input file: <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 6/1569 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1571/1576 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 12 i18n artifacts for locale fr_FR stored in <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] collected 12 i18n artifacts for locale en_GB stored in <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 4/2116 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1940/2124 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Missing file <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> is up-to-date. [INFO] Writing third-party file to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Writing bundled third-party file to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] Will attach third party file from <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 98 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 319 source files to <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.forge.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-u…>:[3,1] class, interface, or enum expected [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

2 2

r1531 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 04:26:12 +0100 (Wed, 29 Jan 2014) New Revision: 1531 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1531 Log: refs #4130: [TECH] S?\195?\169curiser les acc?\195?\168s au site de donn?\195?\169es (ne pas demander d'identifiant si non necessaire) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-29 02:42:24 UTC (rev 1530) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-29 03:26:12 UTC (rev 1531) @@ -105,10 +105,13 @@ } else { result.put(info.name, info); - // ask auth - AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); - if (authenticationInfo != null) { - info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + if (info.needAuthentication) { + + // ask auth + AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); + if (authenticationInfo != null) { + info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + } } if (context.isDbExist()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-29 02:42:24 UTC (rev 1530) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-29 03:26:12 UTC (rev 1531) @@ -85,10 +85,12 @@ if (info != null) { result.put(info.name, info); - // ask auth - AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); - if (authenticationInfo != null) { - info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + if (info.needAuthentication) { + // ask auth + AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); + if (authenticationInfo != null) { + info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + } } }

1 0

r1530 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/action java/fr/ifremer/tutti/ui/swing/util java/fr/ifremer/tutti/ui/swing/util/auth resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: tchemit Date: 2014-01-29 03:42:24 +0100 (Wed, 29 Jan 2014) New Revision: 1530 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1530 Log: fixes #4257: Ajout de message d'erreur si une mise ?\195?\160 jour ne se d?\195?\169roule pas bien refs #4130: [TECH] S?\195?\169curiser les acc?\195?\168s au site de donn?\195?\169es Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java trunk/tutti-ui-swing/src/main/resources/icons/action-info.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.shared.application.ApplicationIOUtil; +import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.shared.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; @@ -163,9 +164,8 @@ if (error != null) { // something bad while updating jre - if (log.isErrorEnabled()) { - log.error("Could not update jre", error); - } + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(_("tutti.applicationUpdater.jre.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.JRE, appToUpdate); if (info != null) { @@ -188,9 +188,8 @@ if (error != null) { // something bad while updating application - if (log.isErrorEnabled()) { - log.error("Could not update tutti", error); - } + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(_("tutti.applicationUpdater.tutti.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.TUTTI, appToUpdate); if (info != null) { @@ -244,9 +243,8 @@ if (error != null) { // something bad while updating i18n - if (log.isErrorEnabled()) { - log.error("Could not update i18n", error); - } + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(_("tutti.applicationUpdater.i18n.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.I18N, appToUpdate); if (info != null) { @@ -268,10 +266,9 @@ Exception error = getError(UpdateType.HELP, appUpdateError); if (error != null) { - // something bad while updating i18n - if (log.isErrorEnabled()) { - log.error("Could not update help", error); - } + // something bad while updating help + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(_("tutti.applicationUpdater.help.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.HELP, appToUpdate); if (info != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,11 +105,11 @@ } else { result.put(info.name, info); - // add auth - info.setAuthentication( - "t" + "u" + "t" + "t" + "i" + "d" + "b", - new char[]{'3', 'R', 'A', 'C', 'e', 'v', '2', 'N', 'w', '8', 'u', 'E', 'D', 'E', 'v', 's', 'y', '0', 'v', 'J'} - ); + // ask auth + AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); + if (authenticationInfo != null) { + info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + } if (context.isDbExist()) { @@ -138,6 +139,7 @@ public void updateDone(Map<String, ApplicationInfo> appToUpdate, Map<String, Exception> appUpdateError) { + ApplicationInfo info = appToUpdate.get(DB_UPDATE_NAME); Exception error = appUpdateError.get(DB_UPDATE_NAME); if (error != null) { @@ -145,33 +147,37 @@ if (log.isErrorEnabled()) { log.error("Could not update db", error); } - throw new ApplicationActionException(action, error); - } else { - ApplicationInfo info = appToUpdate.get(DB_UPDATE_NAME); - if (info != null) { + String errorMessage; + if (info != null && info.needAuthentication) { + errorMessage = _("tutti.updateDb.error.with.auth"); + } else { + errorMessage = _("tutti.updateDb.error.with.noauth"); + } + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(errorMessage, error)); + } else if (info != null) { - if (log.isInfoEnabled()) { - log.info(String.format( - "A db update was downloaded (oldVersion: %s, newVersion: %s), will process it.", - info.oldVersion, info.newVersion)); - } + if (log.isInfoEnabled()) { + log.info(String.format( + "A db update was downloaded (oldVersion: %s, newVersion: %s), will process it.", + info.oldVersion, info.newVersion)); + } - // before install or update, regenerate db configuration files + // before install or update, regenerate db configuration files - TuttiConfiguration configuration = regenerateDbConf(); + TuttiConfiguration configuration = regenerateDbConf(); - configuration.generateExternalDbFiles(true); + configuration.generateExternalDbFiles(true); - if (dbInstalled) { + if (dbInstalled) { - // first database, just copy it to correct directory + // first database, just copy it to correct directory - prepareFirstDatabase(info); - } else if (dbUpdated) { + prepareFirstDatabase(info); + } else if (dbUpdated) { - // launch a referential synchronize operation - synchronizetDatabase(info); - } + // launch a referential synchronize operation + synchronizetDatabase(info); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -25,9 +25,11 @@ */ import com.google.common.collect.Maps; +import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.shared.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.updater.ApplicationInfo; @@ -83,11 +85,11 @@ if (info != null) { result.put(info.name, info); - // add auth - info.setAuthentication( - "t" + "u" + "t" + "t" + "i" + "d" + "b", - new char[]{'3', 'R', 'A', 'C', 'e', 'v', '2', 'N', 'w', '8', 'u', 'E', 'D', 'E', 'v', 's', 'y', '0', 'v', 'J'} - ); + // ask auth + AuthenticationInfo authenticationInfo = context.getAuthenticationInfo(info.url); + if (authenticationInfo != null) { + info.setAuthentication(authenticationInfo.getLogin(), authenticationInfo.getPassword()); + } } return result; @@ -122,24 +124,27 @@ protected boolean updateDoneReport(Map<String, ApplicationInfo> appToUpdate, Map<String, Exception> appUpdateError) { boolean doRestart = false; + ApplicationInfo info = getInfo(REPORT_UPDATE_NAME, appToUpdate); Exception error = getError(REPORT_UPDATE_NAME, appUpdateError); if (error != null) { // something bad while updating jre - if (log.isErrorEnabled()) { - log.error("Could not update report", error); + String errorMessage; + if (info != null && info.needAuthentication) { + errorMessage = _("tutti.updateReport.error.with.auth"); + } else { + errorMessage = _("tutti.updateReport.error.with.noauth"); } - } else { - ApplicationInfo info = getInfo(REPORT_UPDATE_NAME, appToUpdate); - if (info != null) { + throw ApplicationActionException.propagateError( + action, new ApplicationTechnicalException(errorMessage, error)); + } else if (info != null) { - if (log.isInfoEnabled()) { - log.info(String.format( - "A report update was downloaded (oldVersion: %s, newVersion: %s), will restart application to use it", - info.oldVersion, info.newVersion)); - } - doRestart = true; + if (log.isInfoEnabled()) { + log.info(String.format( + "A report update was downloaded (oldVersion: %s, newVersion: %s), will restart application to use it", + info.oldVersion, info.newVersion)); } + doRestart = true; } return doRestart; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -62,6 +62,8 @@ import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; +import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; +import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -265,6 +267,8 @@ private final ApplicationActionEngine tuttiActionEngine; + private final Map<String, AuthenticationInfo> updateAuthenticationStore; + public static TuttiUIContext newContext(TuttiConfiguration config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -340,6 +344,7 @@ addMessageNotifier(logMessageNotifier); tuttiActionFactory = new TuttiActionFactory(); tuttiActionEngine = new ApplicationActionEngine(tuttiActionFactory); + this.updateAuthenticationStore = Maps.newTreeMap(); } @Override @@ -922,6 +927,27 @@ } //------------------------------------------------------------------------// + //-- Authentication methods --// + //------------------------------------------------------------------------// + + public AuthenticationInfo getAuthenticationInfo(String url) { + + // get existing info + AuthenticationInfo authentication = updateAuthenticationStore.get(url); + + // ask user authentication + authentication = new LoginUI(this).open(url, authentication).getAuthenticationInfo(); + + if (authentication != null) { + + // store it back in authentication store + updateAuthenticationStore.put(url, authentication); + } + + return authentication; + } + + //------------------------------------------------------------------------// //-- Other methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + import com.google.common.base.Joiner; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -0,0 +1,55 @@ +package fr.ifremer.tutti.ui.swing.util.auth; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.io.Serializable; + +/** + * Created on 1/28/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class AuthenticationInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + protected final String login; + + protected final char[] password; + + public AuthenticationInfo(String login, char[] password) { + this.login = login; + this.password = password; + } + + public String getLogin() { + return login; + } + + public char[] getPassword() { + return password; + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 2014-01-29 02:42:24 UTC (rev 1530) @@ -0,0 +1,56 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +#loginDialog { + modal: true; + title: "tutti.login.title"; +} + +#infoMessage { + actionIcon: info; +} + +#loginLabel { + text: "tutti.login.field.login"; + labelFor: {loginField}; +} + +#passwordLabel { + text: "tutti.login.field.password"; + labelFor: {passwordField}; +} + +#cancelButton { + actionIcon: cancel; + text: "tutti.common.cancel"; + toolTipText: "tutti.common.cancel"; + i18nMnemonic: "tutti.common.cancel.mnemonic"; +} + +#acceptButton { + actionIcon: accept; + text: "tutti.common.validate"; + toolTipText: "tutti.common.validate"; + i18nMnemonic: "tutti.common.validate.mnemonic"; +} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-29 02:42:24 UTC (rev 1530) @@ -0,0 +1,83 @@ + +<JDialog id='loginDialog' layout='{new BorderLayout()}'> + + <import> + fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + </import> + + <script><![CDATA[ + +public LoginUI(TuttiUIContext context) { + super(context.getMainUI()); + TuttiUIUtil.setApplicationContext(this, context); +} + +public LoginUI open(String url, AuthenticationInfo authenticationInfo) { + handler.open(url, authenticationInfo); + return this; +} + +public AuthenticationInfo getAuthenticationInfo() { return handler.getAuthenticationInfo(); } + ]]></script> + + <Table id='mainPanel' fill='both'> + + <row> + <cell columns="2"> + <JLabel id='infoMessage'/> + </cell> + </row> + + <row> + <cell> + <JLabel id='loginLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='loginField'/> + </cell> + </row> + + <row> + <cell> + <JLabel id='passwordLabel'/> + </cell> + <cell weightx='1'> + <JPasswordField id='passwordField'/> + </cell> + </row> + + <row> + <cell columns='2'> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> + <JButton id='acceptButton' onActionPerformed='handler.accept()'/> + </JPanel> + </cell> + </row> + + </Table> + +</JDialog> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-29 02:42:24 UTC (rev 1530) @@ -0,0 +1,91 @@ +package fr.ifremer.tutti.ui.swing.util.auth; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; + +import static org.nuiton.i18n.I18n._; + +/** + * Created on 1/29/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class LoginUIHandler implements UIHandler<LoginUI> { + + protected LoginUI ui; + + protected AuthenticationInfo authenticationInfo; + + @Override + public void beforeInit(LoginUI ui) { + this.ui = ui; + } + + @Override + public void afterInit(LoginUI ui) { + } + + public void open(String url, AuthenticationInfo authenticationInfo) { + + ui.getInfoMessage().setText(_("tutti.login.infoMmessage", url)); + ui.getLoginField().setText(authenticationInfo == null ? null : authenticationInfo.getLogin()); + ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); + ui.pack(); + + MainUI mainUI = TuttiUIUtil.getApplicationContext(ui).getMainUI(); + if (mainUI != null) { + + // we need to wait until the optional action ui is launch + try { + Thread.sleep(1001); + } catch (InterruptedException e) { + //ignore it + } + } + if (mainUI != null) { + SwingUtil.center(mainUI, ui); + } + ui.setVisible(true); + } + + public void cancel() { + ui.dispose(); + } + + public void accept() { + authenticationInfo = new AuthenticationInfo(ui.getLoginField().getText(), + ui.getPasswordField().getPassword()); + ui.dispose(); + } + + protected AuthenticationInfo getAuthenticationInfo() { + return authenticationInfo; + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-29 02:42:24 UTC (rev 1530) @@ -12,6 +12,9 @@ tutti.about.update.title= tutti.addSampleCategoryBenthosBatch.title= tutti.addSampleCategorySpeciesBatch.title= +tutti.applicationUpdater.help.error= +tutti.applicationUpdater.i18n.error= +tutti.applicationUpdater.jre.error= tutti.applicationUpdater.prepareFirstDB.copyDirectory.error= tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error= tutti.applicationUpdater.startUpdate.db.installation= @@ -24,6 +27,7 @@ tutti.applicationUpdater.synchroDB.prepare.error= tutti.applicationUpdater.synchroDB.synchro.error= tutti.applicationUpdater.synchroDB.writeVersion.error= +tutti.applicationUpdater.tutti.error= tutti.applicationUpdater.updateDone.deleteDirectory.caches.error= tutti.applicationUpdater.updateDone.deleteDirectory.dbConf.error= tutti.applicationUpdater.updateDone.deleteDirectory.enum.error= @@ -65,6 +69,8 @@ tutti.commentEditor.action.tip= tutti.commentEditor.none.tip= tutti.commentEditor.title= +tutti.common.accept= +tutti.common.accept.mnemonic= tutti.common.askBeforeCloneProtocol.help= tutti.common.askBeforeEditProtocol.help= tutti.common.askBeforeEditProtocol.title= @@ -1203,6 +1209,10 @@ tutti.label.tab.individualObservations= tutti.label.tab.marineLitter= tutti.label.tab.species= +tutti.login.field.login= +tutti.login.field.password= +tutti.login.infoMmessage= +tutti.login.title= tutti.main.action.about= tutti.main.action.about.mnemonic= tutti.main.action.about.tip= @@ -1496,6 +1506,10 @@ tutti.updateApplication.message.success= tutti.updateApplication.noUpdate= tutti.updateApplication.title.success= +tutti.updateDb.error.with.auth= +tutti.updateDb.error.with.noauth= +tutti.updateReport.error.with.auth= +tutti.updateReport.error.with.noauth= tutti.updateReport.message.success= tutti.updateReport.noUpdate= tutti.updateReport.title.success= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-28 18:37:06 UTC (rev 1529) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-29 02:42:24 UTC (rev 1530) @@ -12,6 +12,9 @@ tutti.about.update.title=Mise à jour Tutti tutti.addSampleCategoryBenthosBatch.title=Catégorisation du lot (ajout) tutti.addSampleCategorySpeciesBatch.title=Catégorisation du lot (ajout) +tutti.applicationUpdater.help.error=Impossible de télécharger la mise à jour de l'aide. Si le problème persiste, veuillez consulter l'administrateur. +tutti.applicationUpdater.i18n.error= +tutti.applicationUpdater.jre.error=Impossible de télécharger la mise à jour de l'environnement java. Si le problème persiste, veuillez consulter l'administrateur. tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error=Erreur lors de la suppression du dossier %s tutti.applicationUpdater.startUpdate.db.installation=Téléchargement et installation de la base (version %s) @@ -24,6 +27,7 @@ tutti.applicationUpdater.synchroDB.prepare.error=Erreur lors de la préparation de la synchronisation de la base tutti.applicationUpdater.synchroDB.synchro.error=Erreur lors de la synchronisation de la base tutti.applicationUpdater.synchroDB.writeVersion.error=Erreur lors de l'écriture de la nouvelle version de la base de données dans le fichier %s +tutti.applicationUpdater.tutti.error=Impossible de télécharger la mise à jour de Allegro Campagne. Si le problème persiste, veuillez consulter l'administrateur. tutti.applicationUpdater.updateDone.deleteDirectory.caches.error=Erreur lors de la suppression du dossier des caches tutti.applicationUpdater.updateDone.deleteDirectory.dbConf.error=Erreur lors de la suppression du dossier de configuration de base de données tutti.applicationUpdater.updateDone.deleteDirectory.enum.error=Erreur lors de la suppression du dossier d'énumération @@ -1196,6 +1200,10 @@ tutti.label.tab.individualObservations=Observations individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.species=Espèces +tutti.login.field.login=Login +tutti.login.field.password=Mot de passe +tutti.login.infoMmessage=<html><body>Une authentification est requise pour accéder à la ressource %s<hr></body></html> +tutti.login.title=Demande d'authentification tutti.main.action.about=À propos tutti.main.action.about.mnemonic=À tutti.main.action.about.tip=À Propos @@ -1489,6 +1497,10 @@ tutti.updateApplication.message.success=La mise à jour du logiciel nécessite le redémarrage de l'application tutti.updateApplication.noUpdate=Aucune mise à jour de l'application détectée. tutti.updateApplication.title.success=Redémarrage de l'application nécessaire... +tutti.updateDb.error.with.auth=Impossible de télécharger la base de données. Le login / mot de passe que vous avez saisis n'étaient peut-être pas corrects. Si le problème persiste, veuillez consulter l'administrateur. +tutti.updateDb.error.with.noauth=Impossible de télécharger la base de données. Si le problème persiste, veuillez consulter l'administrateur. +tutti.updateReport.error.with.auth=Impossible de télécharger la mise à jour des rapports. Le login / mot de passe que vous avez saisis n'étaient peut-être pas corrects. Si le problème persiste, veuillez consulter l'administrateur. +tutti.updateReport.error.with.noauth=Impossible de télécharger la mise à jour des rapports. Si le problème persiste, veuillez consulter l'administrateur. tutti.updateReport.message.success=La mise à jour des rapports nécessite le redémarrage de l'application tutti.updateReport.noUpdate=Aucune mise à jour de rapports détectée. tutti.updateReport.title.success=Redémarrage de l'application nécessaire... Copied: trunk/tutti-ui-swing/src/main/resources/icons/action-info.png (from rev 1521, trunk/tutti-ui-swing/src/main/resources/icons/info.png) =================================================================== (Binary files differ)

1 0

r1529 - in trunk: . tutti-ichtyometer tutti-ichtyometer/src tutti-ichtyometer/src/main tutti-ichtyometer/src/main/java tutti-ichtyometer/src/main/java/fr tutti-ichtyometer/src/main/java/fr/ifremer tutti-ichtyometer/src/main/java/fr/ifremer/tutti tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive tutti-ichtyometer/src/main/resources tutti-ichtyom
by tchemit＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: tchemit Date: 2014-01-28 19:37:06 +0100 (Tue, 28 Jan 2014) New Revision: 1529 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1529 Log: refs #3875: Import des mensurations en continue depuis un ictyom?\195?\168tre (ajout API) Added: trunk/tutti-ichtyometer/ trunk/tutti-ichtyometer/LICENSE.txt trunk/tutti-ichtyometer/README.txt trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/ trunk/tutti-ichtyometer/src/main/ trunk/tutti-ichtyometer/src/main/java/ trunk/tutti-ichtyometer/src/main/java/fr/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java trunk/tutti-ichtyometer/src/main/resources/ trunk/tutti-ichtyometer/src/main/resources/i18n/ trunk/tutti-ichtyometer/src/main/resources/i18n/tutti-ichtyometer_en_GB.properties trunk/tutti-ichtyometer/src/main/resources/i18n/tutti-ichtyometer_fr_FR.properties trunk/tutti-ichtyometer/src/test/ trunk/tutti-ichtyometer/src/test/java/ trunk/tutti-ichtyometer/src/test/java/fr/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java trunk/tutti-ichtyometer/src/test/resources/ trunk/tutti-ichtyometer/src/test/resources/log4j.properties Property changes on: trunk/tutti-ichtyometer ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea Added: trunk/tutti-ichtyometer/LICENSE.txt =================================================================== --- trunk/tutti-ichtyometer/LICENSE.txt (rev 0) +++ trunk/tutti-ichtyometer/LICENSE.txt 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Property changes on: trunk/tutti-ichtyometer/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-ichtyometer/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml (rev 0) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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> + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>tutti</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> + + <groupId>fr.ifremer.tutti</groupId> + <artifactId>tutti-ichtyometer</artifactId> + + <name>Tutti :: Ichtyometer API</name> + + <properties> + + </properties> + + <dependencies> + + <dependency> + <groupId>net.sf.bluecove</groupId> + <artifactId>bluecove</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.bluecove</groupId> + <artifactId>bluecove-gpl</artifactId> + </dependency> + +  +  + +  + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Property changes on: trunk/tutti-ichtyometer/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,335 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.intel.bluetooth.BlueCoveImpl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.bluetooth.BluetoothStateException; +import javax.bluetooth.DataElement; +import javax.bluetooth.DeviceClass; +import javax.bluetooth.DiscoveryAgent; +import javax.bluetooth.DiscoveryListener; +import javax.bluetooth.LocalDevice; +import javax.bluetooth.RemoteDevice; +import javax.bluetooth.ServiceRecord; +import javax.bluetooth.UUID; +import javax.microedition.io.Connector; +import javax.microedition.io.StreamConnection; +import java.io.Closeable; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Ichtyometer bluetooth client. + * + * Created on 10/11/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class IchtyometerClient implements Closeable { + + /** Logger. */ + private static final Log log = LogFactory.getLog(IchtyometerClient.class); + + /** + * Local bluetooth device. + */ + protected LocalDevice localDevice; + + /** + * Set of opened connections. + */ + protected final Set<StreamConnection> connections = Sets.newHashSet(); + + /** + * Remote BigFin bluetooth device. + */ + protected RemoteDevice remoteDevice; + + /** + * Url connection to the remote device. + */ + protected String connectionUrl; + + /** + * Flag set to {@code true} if {@link #open(RemoteDeviceChooser)} method was invoked with success. + */ + protected boolean open; + + public void open(RemoteDeviceChooser remoteDeviceChooser) throws IOException { + + Preconditions.checkState(!open, "Client is already opened"); + + try { + localDevice = LocalDevice.getLocalDevice(); + } catch (BluetoothStateException e) { + throw new LocalDeviceNotFoundException(); + } + + // get remote devices + Map<String, RemoteDevice> devices; + try { + devices = discoverDevices(); + } catch (Exception e) { + throw new RemoteDeviceNotFoundException("Could not detected devices", e); + } + + if (devices.isEmpty()) { + throw new RemoteDeviceNotFoundException("No remote device found"); + } + + // ask user to choose the device + String userDeviceName = remoteDeviceChooser.chooseRemoteDevice(devices.keySet()); + + if (userDeviceName == null) { + throw new RemoteDeviceNotFoundException("User did not choose a remote device"); + } + + remoteDevice = devices.get(userDeviceName); + + if (remoteDevice == null) { + throw new RemoteDeviceNotFoundException( + "Could not find remote device with name '" + userDeviceName + "'"); + } + + int serviceIndex = 3; + List<ServiceRecord> serviceRecords; + try { + serviceRecords = discoverServiceUrls(new UUID(serviceIndex), remoteDevice); + } catch (Exception e) { + throw new RemoteDeviceNotFoundException("Could not read remote device services", e); + } + + if (serviceRecords.isEmpty()) { + throw new RemoteDeviceServiceNotFoundException("No services detected."); + } + + if (log.isInfoEnabled()) { + log.info("Found some services for index: " + serviceIndex); + } + serviceRecords.addAll(serviceRecords); + + // take first service record + ServiceRecord serviceRecord = serviceRecords.get(0); + + // get connection url + connectionUrl = serviceRecord.getConnectionURL(ServiceRecord.NOAUTHENTICATE_NOENCRYPT, true); + + String serviceName = IchtyometerClient.getServiceName(serviceRecord); + if (log.isInfoEnabled()) { + log.info("Found service(" + serviceIndex + "): " + connectionUrl + (serviceName == null ? "" : ", name: " + serviceName)); + } + + open = true; + } + + @Override + public void close() throws IOException { + + if (!open) { + return; + } + try { + for (StreamConnection connection : Sets.newHashSet(connections)) { + closeConnection(connection); + } + } finally { + + BlueCoveImpl.shutdown(); + } + } + + public StreamConnection openConnection() throws IOException { + + checkIsOpened(); + + StreamConnection connection = (StreamConnection) Connector.open(connectionUrl, 2); + connections.add(connection); + return connection; + } + + public void closeConnection(StreamConnection connection) throws IOException { + checkIsOpened(); + boolean remove = connections.remove(connection); + if (!remove) { + throw new IllegalArgumentException("Connection is not coming from this client, won't close it!"); + } + connection.close(); + } + + public String getConnectionUrl() { + checkIsOpened(); + return connectionUrl; + } + + public boolean isOpen() { + return open; + } + + protected void checkIsOpened() { + if (!open) { + throw new IllegalStateException("Client is not opened!"); + } + } + + protected Map<String, RemoteDevice> discoverDevices() throws BluetoothStateException, InterruptedException { + + Map<String, RemoteDevice> devices = Maps.newTreeMap(); + + MyDiscoveryListener listener = new MyDiscoveryListener(this, devices, null); + + synchronized (this) { + boolean started = localDevice.getDiscoveryAgent().startInquiry(DiscoveryAgent.LIAC, listener); + if (started) { + if (log.isInfoEnabled()) { + log.info("wait for device inquiry to complete..."); + } + this.wait(); + if (log.isInfoEnabled()) { + log.info(devices.size() + " device(s) found"); + } + } + } + return devices; + } + + protected List<ServiceRecord> discoverServiceUrls(UUID serviceUUID, RemoteDevice device) throws BluetoothStateException, InterruptedException { + + List<ServiceRecord> serviceRecords = Lists.newArrayList(); + + MyDiscoveryListener listener = new MyDiscoveryListener(this, + null, + serviceRecords); + + synchronized (this) { + + int[] attrIDs = new int[]{ + 0x0100 // Service name + }; + + localDevice.getDiscoveryAgent().searchServices(attrIDs, + new UUID[]{serviceUUID}, + device, + listener); + this.wait(); + } + + return serviceRecords; + } + + protected static class MyDiscoveryListener implements DiscoveryListener { + + final Object lock; + + final Map<String, RemoteDevice> devices; + + final List<ServiceRecord> serviceRecords; + + MyDiscoveryListener(Object lock, + Map<String, RemoteDevice> devices, + List<ServiceRecord> serviceRecords) { + this.lock = lock; + this.devices = devices; + this.serviceRecords = serviceRecords; + } + + + @Override + public void deviceDiscovered(RemoteDevice btDevice, DeviceClass cod) { + if (log.isInfoEnabled()) { + log.info("Device " + btDevice.getBluetoothAddress() + " found"); + } + + try { + String friendlyName = btDevice.getFriendlyName(false); + if (log.isInfoEnabled()) { + log.info("Name: " + friendlyName); + } + devices.put(friendlyName, btDevice); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't get name of remote", e); + } + } + } + + @Override + public void inquiryCompleted(int discType) { + if (log.isDebugEnabled()) { + log.debug("Device Inquiry completed!"); + } + synchronized (lock) { + lock.notifyAll(); + } + } + + @Override + public void serviceSearchCompleted(int transID, int respCode) { + if (log.isDebugEnabled()) { + log.debug("Service search completed!"); + } + synchronized (lock) { + lock.notifyAll(); + } + } + + @Override + public void servicesDiscovered(int transID, ServiceRecord[] servRecord) { + for (ServiceRecord aServRecord : servRecord) { + String url = aServRecord.getConnectionURL(ServiceRecord.NOAUTHENTICATE_NOENCRYPT, false); + if (url == null) { + continue; + } + serviceRecords.add(aServRecord); + String serviceName = getServiceName(aServRecord); + if (log.isDebugEnabled()) { + log.debug("service found " + url + (serviceName == null ? "" : ", name: " + serviceName)); + } + } + } + } + + public static String getServiceName(ServiceRecord serviceRecord) { + DataElement serviceName = serviceRecord.getAttributeValue(0x0100); + String result; + + if (serviceName == null) { + result = null; + } else { + result = String.valueOf(serviceName.getValue()); + } + return result; + } + +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,40 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.io.IOException; + +/** + * If local device is not found. + * + * Created on 1/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class LocalDeviceNotFoundException extends IOException { + + private static final long serialVersionUID = 1L; +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.util.Set; + +/** + * To choose a remote device. + * Created on 1/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public interface RemoteDeviceChooser { + + /** + * Ask user to choose the device to use. + * + * @param remoteDeviceNames name of discovered remote bluetooth devices. + * @return the name of the remote device to use + */ + String chooseRemoteDevice(Set<String> remoteDeviceNames); +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,52 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.io.IOException; + +/** + * If remote device is not found. + * + * Created on 1/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class RemoteDeviceNotFoundException extends IOException { + + private static final long serialVersionUID = 1L; + + public RemoteDeviceNotFoundException(String message) { + super(message); + } + + public RemoteDeviceNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public RemoteDeviceNotFoundException(Throwable cause) { + super(cause); + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,52 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.io.IOException; + +/** + * If remote device service is not found. + * + * Created on 1/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class RemoteDeviceServiceNotFoundException extends IOException { + + private static final long serialVersionUID = 1L; + + public RemoteDeviceServiceNotFoundException(String message) { + super(message); + } + + public RemoteDeviceServiceNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public RemoteDeviceServiceNotFoundException(Throwable cause) { + super(cause); + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,239 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import com.google.common.base.Preconditions; +import com.google.common.io.Closeables; +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.microedition.io.StreamConnection; +import javax.swing.event.EventListenerList; +import java.io.DataInputStream; +import java.io.IOException; + +/** + * To read some records from a ichtymoeter in feed mode. + * + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class FeedReader { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FeedReader.class); + + protected IchtyometerClient client; + + protected ReadingRunnable readingRunnable; + + protected StreamConnection connection; + + protected final EventListenerList listenerList; + + public FeedReader() { + listenerList = new EventListenerList(); + } + + public void addFeedModeReaderListener(FeedReaderListener listener) { + listenerList.add(FeedReaderListener.class, listener); + } + + public void removeFeedModeReaderListener(FeedReaderListener listener) { + listenerList.remove(FeedReaderListener.class, listener); + } + + public void start(IchtyometerClient client) throws IOException { + + Preconditions.checkNotNull(client, "client can not be null"); + Preconditions.checkState(client.isOpen(), "client must be opened"); + this.client = client; + + // get connection + connection = client.openConnection(); + + // start a reading stream + readingRunnable = new ReadingRunnable(connection); + + Thread readingThread = new Thread(readingRunnable); + + readingThread.start(); + + waitLock(); + + if (log.isDebugEnabled()) { + log.debug("Ready to read remote device..."); + } + FeedReaderEvent e = new FeedReaderEvent(this); + fireReaderStart(e); + } + + public void stop() throws IOException { + + try { + if (readingRunnable != null) { + readingRunnable.setStop(true); + } + waitLock(); + + if (client != null) { + + if (connection != null) { + client.closeConnection(connection); + } + } + + } finally { + + if (client != null) { + Closeables.close(client, true); + } + + FeedReaderEvent e = new FeedReaderEvent(this); + fireReaderStop(e); + } + } + + protected void waitLock() throws IOException { + synchronized (readingRunnable.lock) { + try { + readingRunnable.lock.wait(); + } catch (InterruptedException e) { + throw new IOException("Could not wait..."); + } + } + } + + protected void fireReaderStart(FeedReaderEvent e) { + for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + listener.readerStart(e); + } + } + + protected void fireReaderStop(FeedReaderEvent e) { + for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + listener.readerStop(e); + } + } + + protected void fireRecordRead(FeedReaderEvent e) { + for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + listener.recordRead(e); + } + } + + protected class ReadingRunnable implements Runnable { + + protected final StreamConnection connection; + + protected final Object lock = new Object(); + + protected boolean stop; + + public void setStop(boolean stop) { + this.stop = stop; + } + + public ReadingRunnable(StreamConnection connection) { + this.connection = connection; + } + + protected int records; + + @Override + public void run() { + try { + + if (log.isDebugEnabled()) { + log.debug("Starting... " + this); + } + DataInputStream dataInputStream = connection.openDataInputStream(); + + if (log.isDebugEnabled()) { + log.debug("Open data stream: " + dataInputStream); + } + + synchronized (lock) { + lock.notifyAll(); + } + + while (!stop) { + String result = ""; + + // wait until got two \r + + int nbR = 0; + + String record = null; + String crc = null; + while (nbR != 2) { + + while (dataInputStream.available() > 0) { + int c = dataInputStream.read(); + + if (c == '\r') { + + nbR++; + if (nbR == 1) { + record = result; + if (log.isDebugEnabled()) { + log.debug("Get record: " + record); + } + result = ""; + } else if (nbR == 2) { + crc = result; + if (log.isDebugEnabled()) { + log.debug("Get crc: " + crc); + } + } + } else { + + result += (char) c; + } + } + } + + if (log.isDebugEnabled()) { + log.debug(String.format("Record: %s / %s", record, crc)); + } + FeedReaderRecord readerRecord = new FeedReaderRecord(record, crc); + FeedReaderEvent e = new FeedReaderEvent(FeedReader.this, readerRecord); + fireRecordRead(e); + } + + if (log.isInfoEnabled()) { + log.info("Will stop " + this); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Reading error", e); + } + } + } + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.util.EventObject; + +/** + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class FeedReaderEvent extends EventObject { + + private static final long serialVersionUID = 1L; + + protected FeedReaderRecord record; + + public FeedReaderEvent(FeedReader source) { + this(source, null); + } + + public FeedReaderEvent(FeedReader source, FeedReaderRecord record) { + super(source); + this.record = record; + } + + @Override + public FeedReader getSource() { + return (FeedReader) super.getSource(); + } + + public FeedReaderRecord getRecord() { + return record; + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,43 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.util.EventListener; + +/** + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public interface FeedReaderListener extends EventListener { + + void readerStart(FeedReaderEvent event); + + void readerStop(FeedReaderEvent event); + + void recordRead(FeedReaderEvent event); + +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,145 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Record_id,length(mm),weight(g),species,cruise,station,pan,Dt,sz class,gender,text, + * + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class FeedReaderRecord { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FeedReaderRecord.class); + + protected float length; + + protected float weight; + + protected String species; + + protected String cruise; + + protected String station; + + protected String pan; + + protected String sizeClass; + + protected String gender; + + protected String text; + + protected final String record; + + protected final String crc; + + public static String computeCRC(String record) { + + // use long because int are signed and add doesn't work correctly + long checksum = 0; + + long mask = 0b0000000000000000000000000000000011111111111111111111111111111111L; + + for (int i = 0, recordLength = record.length(); i < recordLength; i++) { + + checksum = checksum & mask; + + long msb = checksum >> 31; + + log.debug(String.format("i=%4d char=%s(int:%3d) incoming checksum=%10d msb=%d bits=%33s", i, record.charAt(i), (int) record.charAt(i), checksum, msb, Long.toBinaryString(checksum))); + + // get msb + + // logical shift left + checksum <<= 1; + log.debug(String.format("After lef shift : %33s", Long.toBinaryString(checksum))); + + // MSB becomes LSB + checksum += msb; + log.debug(String.format("After add smb : %33s", Long.toBinaryString(checksum))); + + // add new car + checksum += record.charAt(i); + log.debug(String.format("After add car : %33s", Long.toBinaryString(checksum))); + } + + String hex = Long.toHexString(checksum).toUpperCase(); + log.debug("checksum= " + checksum); + return hex; + } + + public static FeedReaderRecord newRecord(String record, String crc) { + + // do the crc check +// record = record.trim(); + + String checksum = computeCRC(record); + + if (log.isInfoEnabled()) { + log.info("Incoming crc: " + crc); + log.info("Computed crc: " + checksum); + } + + if (!crc.equals(checksum)) { + throw new IllegalArgumentException("Invalid record (" + record + "), CRC verification failed"); + } + FeedReaderRecord result = new FeedReaderRecord(record, crc); + return result; + } + + protected FeedReaderRecord(String record, String crc) { + this.record = record; + this.crc = crc; + } + + public boolean isValid() { + //TODO crc check + return true; + } + + public String getRecord() { + return record; + } + + public String getCrc() { + return crc; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("record", record) + .append("crc", crc) + .toString(); + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,93 @@ +package fr.ifremer.tutti.ichtyometer.interactive; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import org.apache.commons.lang3.builder.ToStringBuilder; + +import java.io.Serializable; + +/** + * Created on 1/28/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class Command implements Serializable { + + private static final long serialVersionUID = 1L; + + protected final char question; + + protected final String response; + + protected final String crc; + + public Command(char question, String response, String crc) { + this.question = question; + this.response = response; + this.crc = crc; + } + + public char getQuestion() { + return question; + } + + public String getResponse() { + return response; + } + + public String getCrc() { + return crc; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("question", question) + .append("response", response) + .append("crc", crc) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Command)) return false; + + Command command = (Command) o; + + return question == command.question && response.equals(command.response) && + !(crc != null ? !crc.equals(command.crc) : command.crc != null); + + } + + @Override + public int hashCode() { + int result = (int) question; + result = 31 * result + response.hashCode(); + result = 31 * result + (crc != null ? crc.hashCode() : 0); + return result; + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,226 @@ +package fr.ifremer.tutti.ichtyometer.interactive; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; +import com.google.common.io.Closeables; +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.microedition.io.StreamConnection; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +/** + * To send command to the ichtyometer and read his reponses. + * + * Created on 1/28/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class CommandEngine { + + /** Logger. */ + private static final Log log = LogFactory.getLog(CommandEngine.class); + + protected IchtyometerClient client; + + protected StreamConnection connection; + + protected DataOutputStream dataOutputStream; + + protected DataInputStream dataInputStream; + + protected ExecutorService service; + + public void start(IchtyometerClient client) throws IOException { + + Preconditions.checkNotNull(client, "client can not be null"); + Preconditions.checkState(client.isOpen(), "client must be opened"); + this.client = client; + + // create a service executor + this.service = Executors.newSingleThreadScheduledExecutor(); + + // get bluetooth connection + this.connection = client.openConnection(); + + // get input stream (to read) + this.dataInputStream = connection.openDataInputStream(); + + // get output stream (to write) + this.dataOutputStream = connection.openDataOutputStream(); + + // engine is ready + if (log.isDebugEnabled()) { + log.debug("Ready to read remote device..."); + } + } + + public void stop() throws IOException { + + try { + + if (client != null) { + + if (connection != null) { + client.closeConnection(connection); + } + } + + } finally { + + if (client != null) { + Closeables.close(client, true); + } + } + } + + public Command sendCommand(char question) throws IOException { + Preconditions.checkNotNull(question, "command can not be null"); + + Callable<Command> call = new CommandCallable(question, dataInputStream, dataOutputStream); + + Future<Command> submit = service.submit(call); + + try { + Command result = submit.get(30, TimeUnit.SECONDS); + return result; + } catch (InterruptedException | TimeoutException e) { + throw new IchtyometerCommandException("Time out on command " + question, e); + } catch (ExecutionException e) { + throw new IchtyometerCommandException(e.getCause()); + } + } + + protected static class CommandCallable implements Callable<Command> { + + protected Set<Character> questionsWithNoEndLines = Sets.newHashSet( + 'a', 'b', 'g' + ); + + protected char question; + + protected DataInputStream dataInputStream; + + protected DataOutputStream dataOutputStream; + + protected CommandCallable(char question, + DataInputStream dataInputStream, + DataOutputStream dataOutputStream) { + + this.question = question; + this.dataInputStream = dataInputStream; + this.dataOutputStream = dataOutputStream; + } + + @Override + public Command call() throws Exception { + + // send question + dataOutputStream.writeChar(question); + + StringBuilder responseBuilder = new StringBuilder(); + + boolean responseComplete = 'g' == question; + + while (!responseComplete) { + + while (dataInputStream.available() > 0) { + + int c = dataInputStream.read(); + + if (c == '\r') { + + // end of a line + + // wait for 0.1s to see if there is more to come + try { + Thread.sleep(100); + } catch (InterruptedException e) { + if (log.isDebugEnabled()) { + log.debug("Cant wait..."); + } + } + + // no more data to read + responseComplete = dataInputStream.available() == 0; + + if (responseComplete) { + if (log.isDebugEnabled()) { + log.debug("No more data to read after 0.1s, response is complete"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("Will start to read a new line"); + } + responseBuilder.append('\n'); + } + + } else { + + // add caracter to response + responseBuilder.append((char) c); + } + } + + // wait for 0.1s to see if there is more to come + try { + Thread.sleep(100); + } catch (InterruptedException e) { + if (log.isDebugEnabled()) { + log.debug("Cant wait..."); + } + } + + if (!responseComplete && dataInputStream.available() == 0) { + + if (responseBuilder.length() > 0 && questionsWithNoEndLines.contains(question)) { + // this question does not have end of line + responseComplete = true; + } + } + } + + String response = responseBuilder.toString(); + + Command result = new Command(question, response, null); + return result; + } + } + +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,50 @@ +package fr.ifremer.tutti.ichtyometer.interactive; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import java.io.IOException; + +/** + * Created on 1/28/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class IchtyometerCommandException extends IOException { + + private static final long serialVersionUID = 1L; + + public IchtyometerCommandException(String message) { + super(message); + } + + public IchtyometerCommandException(String message, Throwable cause) { + super(message, cause); + } + + public IchtyometerCommandException(Throwable cause) { + super(cause); + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-ichtyometer/src/main/resources/i18n/tutti-ichtyometer_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-ichtyometer/src/main/resources/i18n/tutti-ichtyometer_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java (rev 0) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,62 @@ +package fr.ifremer.tutti.ichtyometer; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import org.junit.Assume; +import org.junit.Test; + +import java.io.IOException; +import java.util.Set; + +/** + * To test {@link IchtyometerClient}. + * + * Created on 10/11/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class IchtyometerClientTest { + + @Test + public void connect() throws IOException, InterruptedException { + + RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override + public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + return remoteDeviceNames.contains("10MF1-E651") ? "10MF1-E651" : null; + } + }; + IchtyometerClient client = new IchtyometerClient(); + try { + client.open(remoteDeviceChooser); + client.close(); + } catch (IOException e) { + Assume.assumeTrue("Could not connect to remote device", true); + } + } + + +} Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java (rev 0) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,82 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +import java.math.BigInteger; + +/** + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +public class FeedReaderRecordTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FeedReaderRecordTest.class); + + @Test + public void testComputeCRC() throws Exception { + + computeCRC(" 00135, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAC6340B"); + computeCRC(" 00158, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAFE340B"); + computeCRC("00513, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB16340B"); + computeCRC("00636, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB6E340B"); + computeCRC("00047, 000000,5,AEG,56,,10/30/77 10:36, 00,Not set,,", "AAC7340B"); + + computeCRC(" 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); + computeCRC("00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); + computeCRC("22, 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); + + /** + * 00135, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,, + + + + + + + + + + + */ + + } + + protected void computeCRC(String record, String expectedCRC) { + + String actualCRC = FeedReaderRecord.computeCRC(record); + if (log.isInfoEnabled()) { + log.info("IncomingCRC: " + expectedCRC + " :: " + new BigInteger(expectedCRC, 16) + " got:" + actualCRC + " :: " + new BigInteger(actualCRC, 16)+ " -- "+new BigInteger(actualCRC, 16).multiply(BigInteger.valueOf(2))); + } +// Assert.assertEquals("Bad crc for '" + record + "', should have " + expectedCRC + ", but get " + actualCRC, expectedCRC, actualCRC); + } +} Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java (rev 0) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,108 @@ +package fr.ifremer.tutti.ichtyometer.feed; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import java.io.IOException; +import java.util.Set; + +/** + * Created on 1/24/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +@Ignore +public class FeedReaderTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FeedReaderTest.class); + + protected IchtyometerClient client; + + @Before + public void setUp() throws Exception { + + RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override + public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + return remoteDeviceNames.contains("10MF1-E651") ? "10MF1-E651" : null; + } + }; + + client = new IchtyometerClient(); + try { + client.open(remoteDeviceChooser); + } catch (IOException e) { + Assume.assumeTrue("Could not connect to remote device", false); + } + } + + @After + public void tearDown() throws Exception { + + if (client != null) { + client.close(); + } + } + + @Test + public void testFeedMode() throws IOException, InterruptedException { + + FeedReader reader = new FeedReader(); + + FeedReaderListener listener = new FeedReaderListener() { + @Override + public void readerStart(FeedReaderEvent event) { + log.info("Reader " + event.getSource() + " is ready to rock!"); + } + + @Override + public void readerStop(FeedReaderEvent event) { + log.info("Reader " + event.getSource() + " is going to bed now!"); + } + + @Override + public void recordRead(FeedReaderEvent event) { + log.info("Reader " + event.getSource() + " read : " + event.getRecord()); + } + }; + reader.addFeedModeReaderListener(listener); + + reader.start(client); + + while (true) { + } + } +} Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java (rev 0) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,117 @@ +package fr.ifremer.tutti.ichtyometer.interactive; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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% + */ + +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import java.io.IOException; +import java.util.Set; + +/** + * Created on 1/28/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.1 + */ +@Ignore +public class CommandEngineTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(CommandEngineTest.class); + + IchtyometerClient client; + + @Before + public void setUp() throws Exception { + + RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override + public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + return remoteDeviceNames.contains("10MF1-E651") ? "10MF1-E651" : null; + } + }; + + client = new IchtyometerClient(); + try { + client.open(remoteDeviceChooser); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not connect to bigfin", e); + } + Assume.assumeTrue("Could not connect to remote device", false); + } + } + + @After + public void tearDown() throws Exception { + + if (client != null) { + client.close(); + } + } + + @Test + public void testSendCommand() throws Exception { + + CommandEngine commandEngine = new CommandEngine(); + + commandEngine.start(client); + + if (log.isInfoEnabled()) { + log.info("Engine is ready let's ask some questions now..."); + } + assertCommand(commandEngine.sendCommand('a'), 'a', "e"); + assertCommand(commandEngine.sendCommand('b'), 'b', "10MF1,153,31,13824"); + assertCommand(commandEngine.sendCommand('c'), 'c', "Record_id,length(mm),weight(g),species,cruise,station,pan,Dt,sz class,gender,text,"); + assertCommand(commandEngine.sendCommand('d'), 'd', "b"); + assertCommand(commandEngine.sendCommand('e'), 'e', "b"); + assertCommand(commandEngine.sendCommand('f'), 'f', "b"); + assertCommand(commandEngine.sendCommand('g'), 'g', "b"); + + commandEngine.stop(); + } + + protected void assertCommand(Command actual, char question, String response) { + + if (log.isInfoEnabled()) { + log.info("Actual command: " + actual); + log.info("Expected result: " + response); + } + + Assert.assertEquals("Expect question " + question + ", but had " + actual.getQuestion(), question, actual.getQuestion()); +// Assert.assertEquals("Expect " + response + ", but had " + actual.getResponse(), response, actual.getResponse()); + } + + +} Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-ichtyometer/src/test/resources/log4j.properties (rev 0) +++ trunk/tutti-ichtyometer/src/test/resources/log4j.properties 2014-01-28 18:37:06 UTC (rev 1529) @@ -0,0 +1,31 @@ +### +# #%L +# Tutti :: Ichtyometer API +# $Id$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2014 Ifremer +# %% +# 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% +### +log4j.rootCategory=INFO, A1 +#log4j.logger.no.api=DEBUG +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n + +log4j.logger.javax.bluetooth=DEBUG +#log4j.logger.fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord=DEBUG \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0