branch develop-5.x updated (f0b461c -> b069328)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from f0b461c Le transfert de 4 nouvelles marées de droite à gauche n'aboutit pas (Fixes #8887) new bd1be8b [iso] improve log of error new b069328 Nouvelle icône (Fixes #8886) 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 b069328ad682ed8dcdf431e6cc28faddb77422bd Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 17:43:43 2016 +0100 Nouvelle icône (Fixes #8886) commit bd1be8b10817eaf54a1fbd0e1658a04fa053c6b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 16:41:58 2016 +0100 [iso] improve log of error Summary of changes: .../observe/application/swing/ui/ObserveMainUI.jcss | 2 +- .../application/swing/ui/actions/ShowAboutAction.java | 4 ++-- .../src/main/resources/icons/logo OT_rvb.png | Bin 143337 -> 0 bytes .../src/main/resources/icons/logo-OT_web.png | Bin 34309 -> 0 bytes .../src/main/resources/icons/logo-small.png | Bin 0 -> 46914 bytes application-swing/src/main/resources/icons/logo.png | Bin 0 -> 232898 bytes pom.xml | 8 +++++++- .../services/topia/ObserveServiceFactoryTopia.java | 2 +- src/site/resources/images/logo-OT_web.png | Bin 34309 -> 0 bytes src/site/resources/images/logo-small.png | Bin 0 -> 46914 bytes src/site/resources/images/logo.png | Bin 0 -> 232898 bytes src/site/rst/index.rst | 8 ++------ src/site/site_fr.xml | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 application-swing/src/main/resources/icons/logo OT_rvb.png delete mode 100644 application-swing/src/main/resources/icons/logo-OT_web.png create mode 100644 application-swing/src/main/resources/icons/logo-small.png create mode 100644 application-swing/src/main/resources/icons/logo.png delete mode 100644 src/site/resources/images/logo-OT_web.png create mode 100644 src/site/resources/images/logo-small.png create mode 100644 src/site/resources/images/logo.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit bd1be8b10817eaf54a1fbd0e1658a04fa053c6b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 16:41:58 2016 +0100 [iso] improve log of error --- .../java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index 384e452..c5f56a6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -242,7 +242,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { return method.invoke(target, args); } catch (InvocationTargetException e) { if (log.isErrorEnabled()) { - log.error("Error in method " + method.getName(), e); + log.error("Error in method " + method.getName(), e.getCause()); } throw e.getCause(); } finally { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b069328ad682ed8dcdf431e6cc28faddb77422bd Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 17:43:43 2016 +0100 Nouvelle icône (Fixes #8886) --- .../observe/application/swing/ui/ObserveMainUI.jcss | 2 +- .../application/swing/ui/actions/ShowAboutAction.java | 4 ++-- .../src/main/resources/icons/logo OT_rvb.png | Bin 143337 -> 0 bytes .../src/main/resources/icons/logo-OT_web.png | Bin 34309 -> 0 bytes .../src/main/resources/icons/logo-small.png | Bin 0 -> 46914 bytes application-swing/src/main/resources/icons/logo.png | Bin 0 -> 232898 bytes pom.xml | 8 +++++++- src/site/resources/images/logo-OT_web.png | Bin 34309 -> 0 bytes src/site/resources/images/logo-small.png | Bin 0 -> 46914 bytes src/site/resources/images/logo.png | Bin 0 -> 232898 bytes src/site/rst/index.rst | 8 ++------ src/site/site_fr.xml | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index 877da9e..a25a602 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -34,7 +34,7 @@ JSplitPane { #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {SwingUtil.createImageIcon("logo-OT_web.png").getImage()}; + iconImage: {SwingUtil.createImageIcon("logo.png").getImage()}; } #menu { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java index 5cc76d8..1c08a69 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java @@ -76,7 +76,7 @@ public class ShowAboutAction extends AbstractAction { String name = ObserveRunner.getRunner().getRunnerName(); AboutUI about = AboutUIBuilder.builder(ui) - .setIconPath("/icons/logo-OT_web.png") + .setIconPath("/icons/logo.png") .setTitle(t("observe.title.about")) .setBottomText(ui.getConfig().getCopyrightText()) .addAboutTab(t("observe.about.message"), true) @@ -90,7 +90,7 @@ public class ShowAboutAction extends AbstractAction { JPanel topPanel = about.getTopPanel(); topPanel.removeAll(); topPanel.setLayout(new BorderLayout()); - topPanel.add(new JLabel(Resource.getIcon("/icons/logo-OT_web.png")), BorderLayout.WEST); + topPanel.add(new JLabel(Resource.getIcon("/icons/logo-small.png")), BorderLayout.WEST); topPanel.add(new JLabel(Resource.getIcon("/icons/logo_ird.png")), BorderLayout.EAST); about.display(); diff --git a/application-swing/src/main/resources/icons/logo OT_rvb.png b/application-swing/src/main/resources/icons/logo OT_rvb.png deleted file mode 100644 index 1c35a25..0000000 Binary files a/application-swing/src/main/resources/icons/logo OT_rvb.png and /dev/null differ diff --git a/application-swing/src/main/resources/icons/logo-OT_web.png b/application-swing/src/main/resources/icons/logo-OT_web.png deleted file mode 100644 index e6b87bd..0000000 Binary files a/application-swing/src/main/resources/icons/logo-OT_web.png and /dev/null differ diff --git a/application-swing/src/main/resources/icons/logo-small.png b/application-swing/src/main/resources/icons/logo-small.png new file mode 100644 index 0000000..a850860 Binary files /dev/null and b/application-swing/src/main/resources/icons/logo-small.png differ diff --git a/application-swing/src/main/resources/icons/logo.png b/application-swing/src/main/resources/icons/logo.png new file mode 100644 index 0000000..4a4c9c8 Binary files /dev/null and b/application-swing/src/main/resources/icons/logo.png differ diff --git a/pom.xml b/pom.xml index 9dc2fc3..a55c54f 100644 --- a/pom.xml +++ b/pom.xml @@ -587,6 +587,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-hikaricp</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP-java6</artifactId> + </exclusion> + </exclusions> </dependency> <!--dependency> @@ -1142,7 +1148,7 @@ </profile> <profile> - <id>generate-changelog</id> + <id>changelog-profile</id> <activation> <property> <name>performRelease</name> diff --git a/src/site/resources/images/logo-OT_web.png b/src/site/resources/images/logo-OT_web.png deleted file mode 100644 index e6b87bd..0000000 Binary files a/src/site/resources/images/logo-OT_web.png and /dev/null differ diff --git a/src/site/resources/images/logo-small.png b/src/site/resources/images/logo-small.png new file mode 100644 index 0000000..a850860 Binary files /dev/null and b/src/site/resources/images/logo-small.png differ diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png new file mode 100644 index 0000000..4a4c9c8 Binary files /dev/null and b/src/site/resources/images/logo.png differ diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 32a34c0..2990157 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -45,19 +45,15 @@ Les documents - `Architecture logicielle`_ - `Road Map`_ -- `Validation`_ - `Administration obstuna`_ - `Administration web`_ -- `Client lourd`_ -- `Le projet maven`_ +- `Configuration`_ .. _Architecture logicielle: architecture-logicielle.html .. _Administration obstuna: install-serverPG.html .. _Administration web: administration-web.html -.. _Validation: Validation.html .. _Road Map: Avancement.html -.. _Client lourd: Observe-Swing.html -.. _Le projet maven: Observe-maven.html +.. _Configuration: config-report.html diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 4d7656f..12c2072 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/v/${siteDeployClassifier}/images/logo-OT_web.png</src> + <src>${project.url}/v/${siteDeployClassifier}/images/logo-small.png</src> <href>index.html</href> </bannerLeft> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm