- Observe-commits - mailman.cloud.codelutin.com

branch develop updated (a2f2ad7 -> 555e473)
by codelutin.com scm Oct. 8, 2016

Oct. 8, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a2f2ad7 Use new ini format for configuration description new 8278ce8 Use last stable of nuiton-config new 555e473 Use new eugene apis The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 555e473eac8d51273da536d22843923c444b5e5a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Oct 8 15:07:25 2016 +0200 Use new eugene apis commit 8278ce8d4452a8b02033fc62e17e2e11b9fa723f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 7 19:08:31 2016 +0200 Use last stable of nuiton-config Summary of changes: application-swing-configuration/pom.xml | 1 + .../ObserveSwingApplicationConfig.java | 82 +++++----------------- .../configuration/ObserveWebApplicationConfig.java | 37 ++-------- pom.xml | 6 +- services-dto/pom.xml | 5 -- .../templates/TopiaMetadataModelGenerator.java | 10 ++- 6 files changed, 28 insertions(+), 113 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (0caab03 -> a2f2ad7)
by codelutin.com scm Oct. 7, 2016

Oct. 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 0caab03 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a2f2ad7 Use new ini format for configuration description The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a2f2ad729b36d3c4ca38602135ecaa63655ce8cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 7 11:58:03 2016 +0200 Use new ini format for configuration description Summary of changes: .../src/main/config/ObserveSwingApplication.ini | 518 ++++++++++++++++++ .../src/main/config/ObserveSwingApplication.toml | 601 --------------------- .../src/main/config/ObserveWebApplication.ini | 99 ++++ .../src/main/config/ObserveWebApplication.toml | 112 ---- pom.xml | 2 +- 5 files changed, 618 insertions(+), 714 deletions(-) create mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.ini delete mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.toml create mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.ini delete mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.toml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/5.0.2 deleted (was b41b096)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0.2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag observe-5.0.2 created (now 8ea6ed5)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-5.0.2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 8ea6ed5 (tag) tagging 011e67144a7d3eafb9a69a200f5a1747fd6698fc (commit) replaces observe-5.0.1 tagged by Maven Release on Tue Oct 4 11:14:08 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0.2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/5.0.2 updated (a4443f1 -> b41b096)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0.2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions adds e513d71 Add missing license header adds b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 22 ++++++++++++++++++++++ application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 25 files changed, 46 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (00befa7 -> 0caab03)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 00befa7 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development new 1503e4e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions new e513d71 Add missing license header new b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions new 011e671 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' new 71b2494 [jgitflow-maven-plugin]merging 'master' into 'develop' new 0caab03 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0caab03a6385aabc54197ae01d0a1ffd2a412022 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:14:18 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 71b249400abf70b68717eff090c4dbf5573b9013 Merge: 1503e4e 011e671 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:14:16 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 1503e4e9bc6afbad093a7567b4b2eec8ff91a46a Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:14:15 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 011e67144a7d3eafb9a69a200f5a1747fd6698fc Merge: c970a73 b41b096 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:14:07 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' commit b41b096611106e20bcf4186306065b6436873f47 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:03:40 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions commit e513d715fe62079b5e989fa0e5879ac9d602b8bf Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 11:02:38 2016 +0200 Add missing license header Summary of changes: .../data/DataSynchroSelectionTreeCellRenderer.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (c970a73 -> 011e671)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c970a73 [jgitflow-maven-plugin]merging 'release/5.0.1' into 'master' adds a087eae [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development adds 1c90770 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8438859 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 97eebb2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 301b04c Amélioration de la documentation sur l'installation serveur web (Fixes #8550) adds 529dd05 Toujours générer le fichier de configuration des logs (et pas seulement en dev mode) (Fixes #8551) adds dd8c68c [WIN] Le serveur ne démarre pas sous Windows en raison d'une erreur POSIX (Fixes #8549) adds 6a95d6a Amélioration de la documentation et du démarrage de l'application web adds 259d5dd Amélioration de la documentation et du démarrage de l'application web adds 5e0ca79 Improve name of release files adds ea6a817 [GEAR] Affichage des valeurs 0 dans les caractéristiques de type Entier (Fixes #8553) adds 80fd120 [UI] Assistant de connexion à un serveur (Fixes #8556) adds ebfe1c2 La boîte "A propos" ne fonctionne pas (fixes #8564) adds 743aef1 Use nuiton-config 3.0-SNAPSHOT adds 1259b0a Normalize configurations and use new configuration description file adds 3659c87 Use now toml configuration description adds 5a6d995 remove yaml configuration files adds dcbca30 Use nuiton-config 3.0 \o/ adds 15c02cf [GESTION AVANCEE DES MAREES] Identifier les marées qui sont présentes des 2 côtés (Fixes #8575) adds f6c4c24 Dans l'UI de gestion avancée du référentiel, l'affichage des dates est différent à droite et à gauche (Fixes #8574) adds 00717c6 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) adds d448e55 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) adds a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions adds e513d71 Add missing license header adds b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions adds 011e671 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 15 +- .../src/main/config/ObserveSwingApplication.toml | 601 +++++++++++++++++++++ .../ObserveSwingApplicationConfig.java | 51 +- .../ObserveSwingApplicationConfigProvider.java | 59 -- .../org.nuiton.config.ApplicationConfigProvider | 1 - ...pplication-swing-configuration_en_GB.properties | 2 +- ...pplication-swing-configuration_es_ES.properties | 2 +- ...pplication-swing-configuration_fr_FR.properties | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 55 +- application-swing/src/main/assembly/bin.xml | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 84 +++ .../ui/admin/synchronize/data/DataSynchroUI.jcss | 4 +- .../referential/ng/ReferentialSynchroUI.jcss | 6 - .../ng/ReferentialSynchronizeResources.java | 11 + .../ng/action/RegisterDesactivateTaskAction.java | 6 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../GearUseFeatureMeasurementCellEditor.java | 13 +- .../GearUseFeatureMeasurementCellRenderer.java | 24 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 + .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigUI.jcss | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../i18n/application-swing_en_GB.properties | 8 +- .../i18n/application-swing_es_ES.properties | 8 +- .../i18n/application-swing_fr_FR.properties | 8 +- application-web-configuration/pom.xml | 16 +- .../src/main/config/ObserveWebApplication.toml | 112 ++++ .../configuration/ObserveWebApplicationConfig.java | 237 ++++++++ ... ObserveWebApplicationConfigInitException.java} | 6 +- .../ObserveWebApplicationConfiguration.java | 266 --------- .../ObserveWebApplicationConfigurationOption.java | 131 ----- ...ObserveWebApplicationConfigurationProvider.java | 61 --- .../org.nuiton.config.ApplicationConfigProvider | 1 - .../src/main/resources/defaultDatabases.yml | 16 + .../src/main/resources/defaultUsers.yml | 13 + .../application-web-configuration_en_GB.properties | 2 +- .../application-web-configuration_es_ES.properties | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- application-web/pom.xml | 20 +- .../web/ObserveWebApplicationContext.java | 8 +- .../web/ObserveWebApplicationListener.java | 9 +- .../web/controller/ObserveWebMotionController.java | 4 +- .../web/controller/v1/PingServiceController.java | 4 +- .../ObserveWebSecurityApplicationContext.java | 4 +- .../db/ObserveWebDatabasesHelperTest.java | 8 +- .../user/ObserveWebUsersHelperTest.java | 6 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 26 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- .../diff/ReferentialSynchronizeDiffState.java | 8 +- src/site/rst/administration-web.rst.vm | 99 +++- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 69 files changed, 1393 insertions(+), 686 deletions(-) create mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.toml delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java delete mode 100644 application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/{seine => }/GearUseFeatureMeasurementCellEditor.java (90%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/{seine => }/GearUseFeatureMeasurementCellRenderer.java (76%) create mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.toml create mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java rename application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/{ObserveWebApplicationConfigurationInitException.java => ObserveWebApplicationConfigInitException.java} (80%) delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java delete mode 100644 application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider create mode 100644 application-web-configuration/src/main/resources/defaultDatabases.yml create mode 100644 application-web-configuration/src/main/resources/defaultUsers.yml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - ObServe 5.0.2 released
by codelutin.com Release Notification Oct. 4, 2016

Oct. 4, 2016

The ObServe team is pleased to announce the observe-5.0.2 release! Projet ObServe Documentation of the project can be found here: http://observe.codelutin.com Changes ------- Changes in this version include: New features: o Permettre de persister les configurations ergonomiques Issue: 6833. Thanks to Tony Chemit. Resolved by tchemit. o Erreur de type PSQLException : la valeur d'une clé dupliquée rompt la contrainte... -> rendre le message plus explicite Issue: 7028. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Sauver la mise en page de l'UI en quittant Issue: 6236. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Faire apparaître les topiaid sur les formulaires... Issue: 4915. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Améliorer l'algorithme de calcul des vitesses Issue: 6242. Thanks to Tony Chemit. Resolved by tchemit. o Ouverture simultannée de plusieurs marées Issue: 6703. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Amélioration de la documentation sur l'installation serveur web Issue: 8550. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction Issue: 8581. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Le widget des positions a effacé les degrés lors de l'enregistrement Issue: 6981. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Comportement du widget de positions - le quandrant change tout seul lors de la saisie des coordonnées Issue: 6980. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [LL] Utilisation des calendriers de filage/virage Issue: 8044. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Comportements incorrects du widget de saisie des coordonnées Issue: 6762. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [GEAR] Affichage des valeurs 0 dans les caractéristiques de type Entier Issue: 8553. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [UI] Assistant de connexion à un serveur Issue: 8556. Thanks to Pascal CAUQUIL. Resolved by tchemit. o La boîte "A propos" ne fonctionne pas Issue: 8564. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObServeLL] l'appli de démarre plus Issue: 7461. Thanks to Philippe Sabarros. Resolved by psabarros. o Dans l'UI de gestion avancée du référentiel, l'affichage des dates est différent à droite et à gauche Issue: 8574. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Bug d'affichage des scrolling bars dans les listes sous windows Issue: 7876. Thanks to Philippe Sabarros. Resolved by pcauquil. o [PS] format champ starttime dans observe_seine.set Issue: 8015. Thanks to Philippe Sabarros. Resolved by pcauquil. o Toujours générer le fichier de configuration des logs (et pas seulement en dev mode) Issue: 8551. Thanks to Tony Chemit. Resolved by tchemit. o [WIN] Le serveur ne démarre pas sous Windows en raison d'une erreur POSIX Issue: 8549. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [GESTION AVANCEE DES MAREES] Identifier les marées qui sont présentes des 2 côtés Issue: 8575. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases Issue: 8580. Thanks to Pascal CAUQUIL. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/observe/files * observe-5.0.2.zip - https://forge.codelutin.com/attachments/download/4119 * observeweb-5.0.2.war - https://forge.codelutin.com/attachments/download/4120 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository https://nexus.nuiton.org/nexus/content/repositories/other-releases/ Have fun! -ObServe team

1 0

branch release/5.0.2 created (now a4443f1)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0.2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions This branch includes the following new commits: new a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a4443f15f7785da09a7fdf9e124d95668da3f6da Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 10:50:25 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (d448e55 -> 00befa7)
by codelutin.com scm Oct. 4, 2016

Oct. 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from d448e55 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) new 00befa7 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 00befa7bf0fd222153e05ead7f6d042f46f05fe3 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Oct 4 10:50:37 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development Summary of changes: application-web-configuration/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1