Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
R
reefdb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
quadrige
reefdb
Commits
99874fce
Commit
99874fce
authored
Mar 23, 2020
by
PECQUOT
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/3.9.7' into develop
parents
1ab2ade2
f12d7bf4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
53 additions
and
26 deletions
+53
-26
CHANGELOG.md
CHANGELOG.md
+5
-0
pom.xml
pom.xml
+1
-1
reefdb-core/pom.xml
reefdb-core/pom.xml
+1
-1
reefdb-core/src/license/THIRD-PARTY.properties
reefdb-core/src/license/THIRD-PARTY.properties
+1
-1
reefdb-ui-swing/pom.xml
reefdb-ui-swing/pom.xml
+1
-1
reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/content/observation/operation/measurement/grouped/OperationMeasurementsGroupedTableUIHandler.java
...t/grouped/OperationMeasurementsGroupedTableUIHandler.java
+0
-1
reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/util/OneShotListener.java
...java/fr/ifremer/reefdb/ui/swing/util/OneShotListener.java
+23
-0
src/changes/changes.xml
src/changes/changes.xml
+1
-1
src/site/fr/markdown/server.md
src/site/fr/markdown/server.md
+20
-20
No files found.
CHANGELOG.md
View file @
99874fce
## Sprint 89 - v3.9.7
-
Pas de mise à jour de modèle
## Sprint 88 - v3.9.5 & v3.9.6
-
Pas de mise à jour de modèle
...
...
pom.xml
View file @
99874fce
...
...
@@ -10,7 +10,7 @@
<groupId>
fr.ifremer.reefdb
</groupId>
<artifactId>
reefdb
</artifactId>
<version>
3.9.7
-SNAPSHOT
</version>
<version>
3.9.7
</version>
<packaging>
pom
</packaging>
<name>
Reef DB
</name>
...
...
reefdb-core/pom.xml
View file @
99874fce
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
fr.ifremer.reefdb
</groupId>
<artifactId>
reefdb
</artifactId>
<version>
3.9.7
-SNAPSHOT
</version>
<version>
3.9.7
</version>
</parent>
<artifactId>
reefdb-core
</artifactId>
...
...
reefdb-core/src/license/THIRD-PARTY.properties
View file @
99874fce
...
...
@@ -35,7 +35,7 @@
# Please fill the missing licenses for dependencies :
#
#
#
Fri Mar 06 16:15:32
CET 2020
#
Mon Mar 23 12:33:10
CET 2020
com.oracle--ojdbc7--12.1.0.2.0
=
OTN license
commons-primitives--commons-primitives--1.0
=
The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1
=
BSD License
...
...
reefdb-ui-swing/pom.xml
View file @
99874fce
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
fr.ifremer.reefdb
</groupId>
<artifactId>
reefdb
</artifactId>
<version>
3.9.7
-SNAPSHOT
</version>
<version>
3.9.7
</version>
</parent>
<artifactId>
reefdb-ui-swing
</artifactId>
...
...
reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/content/observation/operation/measurement/grouped/OperationMeasurementsGroupedTableUIHandler.java
View file @
99874fce
...
...
@@ -226,7 +226,6 @@ public class OperationMeasurementsGroupedTableUIHandler
// remove measurement from old sampling
if
(
oldValue
!=
null
)
{
SamplingOperationDTO
oldSamplingOperation
=
(
SamplingOperationDTO
)
oldValue
;
// fixme: il rest edes mesures dans le operation !!!!!!!!!!!!!!
oldSamplingOperation
.
removeAllIndividualMeasurements
(
row
.
getIndividualMeasurements
());
oldSamplingOperation
.
setDirty
(
true
);
...
...
reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/util/OneShotListener.java
View file @
99874fce
package
fr.ifremer.reefdb.ui.swing.util
;
/*-
* #%L
* Reef DB :: UI
* $Id:$
* $HeadURL:$
* %%
* Copyright (C) 2014 - 2020 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
import
javax.annotation.Nonnull
;
import
java.awt.Component
;
import
java.beans.PropertyChangeEvent
;
...
...
src/changes/changes.xml
View file @
99874fce
...
...
@@ -31,7 +31,7 @@
</properties>
<body>
<release
version=
"3.9.7"
date=
"2020-03-
19
"
description=
"Stable release"
>
<release
version=
"3.9.7"
date=
"2020-03-
23
"
description=
"Stable release"
>
<action
dev=
"ludovic.pecquot@e-is.pro"
type=
"fix"
issue=
"51520"
>
Rework the calculation of individual ids on grouped measurements, now use table sorting if possible
</action>
...
...
src/site/fr/markdown/server.md
View file @
99874fce
...
...
@@ -108,26 +108,26 @@ Un déploiement sans modification des scripts de Tomcat est possible :
-
Décommenté les parties XML suivantes, et renseigner les attributs XML :
``url``
,
``username``
,
``password``
,
``value``
(
``/path/to/config/file``
) :
>
<Resource
>
name="quadrige3-ds"
>
auth="Container"
>
type="javax.sql.DataSource"
>
driverClassName="oracle.jdbc.driver.OracleDriver"
>
url="jdbc:oracle:thin:@HOST:1521:INSTANCE"
>
username="USER"
>
password="PWD"
>
maxActive="20"
>
maxIdle="2"
>
maxWait="-1"
>
/>
>
>
<!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) -->
>
<Environment
>
name="synchro-server.config"
>
type="java.lang.String"
>
value="/path/to/config/file"
>
override="false"
>
/>
<Resource
name="quadrige3-ds"
auth="Container"
type="javax.sql.DataSource"
driverClassName="oracle.jdbc.driver.OracleDriver"
url="jdbc:oracle:thin:@HOST:1521:INSTANCE"
username="USER"
password="PWD"
maxActive="20"
maxIdle="2"
maxWait="-1"
/>
<!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) -->
<Environment
name="synchro-server.config"
type="java.lang.String"
value="/path/to/config/file"
override="false"
/>
-
Reconstruire le fichier
``.war``
, puis dployer sous Tomcat comme précédemment (sans modifier les scripts de lancement).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment