Skip to content
This repository has been archived by the owner on Sep 6, 2022. It is now read-only.

Commit

Permalink
Merge branch 'jtango-9-lts' of https://github.com/tango-controls/JTango…
Browse files Browse the repository at this point in the history 
… into jtango-9-lts
  • Loading branch information
gwen-soleil committed Nov 19, 2019
2 parents 735d477 + b00043a commit 12469a4
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 67 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ sudo: false
services:
- docker

git:
depth: false

env:
- TANGO_HOST=localhost:10000

Expand Down
2 changes: 1 addition & 1 deletion .travis/maven_deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

cp .travis/settings.xml $HOME/.m2/settings.xml

mvn deploy -Dmaven.test.skip=true
mvn deploy -Dmaven.test.skip=true -Prelease

cd parent
mvn versions:set versions:update-child-modules -DprocessAllModules -DnextSnapshot -DgenerateBackupPoms=false
Expand Down
21 changes: 11 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@
[![Build Status](https://travis-ci.org/tango-controls/JTango.svg?branch=jtango-9-lts)](https://travis-ci.org/tango-controls/JTango)
[![Documentation Status](https://readthedocs.org/projects/jtango/badge/?version=jtango-9-lts)](http://jtango.readthedocs.io/en/jtango-9-lts/?badge=jtango-9-lts)

[![Download](https://api.bintray.com/packages/tango-controls/generic/JTango-9-LTS/images/download.svg) ](https://bintray.com/tango-controls/generic/JTango-9-LTS/_latestVersion)
[ ![Download](https://api.bintray.com/packages/tango-controls/jtango/JTango/images/download.svg) ](https://bintray.com/tango-controls/jtango/JTango/_latestVersion)
[![License](https://img.shields.io/badge/license-LGPL--3.0-blue.svg)](https://github.com/tango-controls/JTango/blob/jtango-9-lts/LICENSE)

## SonarCloud

[![Quality gate](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)

[![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Reliability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Security](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)

[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Code smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Tech debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)


[![Lines of code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts)
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)
[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root)

# JavaDoc

Expand Down
42 changes: 2 additions & 40 deletions assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -124,43 +124,5 @@
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>deploy-jar</id>
<phase>deploy</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>curl</executable>
<arguments>
<argument>-T</argument>
<argument>
${shaded.outputFile}
</argument>
<argument>-u${bintray.user.name}:${bintray.user.apikey}</argument>
<argument>
https://api.bintray.com/content/tango-controls/generic/${project.artifactId}-9-LTS/${project.version}/${project.artifactId}-${project.version}.jar;publish=1
</argument>
<argument>--verbose</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</build>
</project>
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>JTangoClientLang</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dao/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
19 changes: 9 additions & 10 deletions dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ public class ZmqMainThread extends Thread {

private static final long SendHwmSocket = 10000;
//===============================================================
private class ZmqPollers extends ZMQ.Poller {
//===============================================================
private static class ZmqPollers extends ZMQ.Poller {
private ZmqPollers(ZMQ.Context context, int size) {
super(context, size);
}
}
//===============================================================
//===============================================================
/**
* Default constructor
* @param context ZMQ context instance
Expand Down Expand Up @@ -667,19 +667,20 @@ private void connectIfNotDone(ZMQ.Socket socket, ZMQutils.ControlStructure contr
// Check if it ia a reconnection -> disconnect before connection
if (controlStructure.forceReconnection && alreadyConnected(controlStructure.endPoint)) {
try {
// needs an un subscribe before disconnection
//socket.unsubscribe(controlStructure.eventName.getBytes());
socket.disconnect(controlStructure.endPoint);
}
catch (org.zeromq.ZMQException e) {
System.err.println(e.getMessage());
}
}

// Do the connection
//System.out.println("Connect on " + controlStructure.endPoint);
//System.out.println(" for " + controlStructure.eventName);
socket.setHWM(controlStructure.hwm);

// Do the connection (HWM for send is set without limit
// to avoid problem due to the buffer size when connect
// to server for large number of attributes)
socket.setSndHWM(0);
socket.setRcvHWM(controlStructure.hwm);
socket.connect(controlStructure.endPoint);
if (!alreadyConnected(controlStructure.endPoint)) {
EventList eventList = new EventList();
Expand Down Expand Up @@ -763,11 +764,9 @@ private static String formatTime(long ms)

return time + "." + ms;
}


//===============================================================
//===============================================================
private class EventList extends ArrayList<String> {
private static class EventList extends ArrayList<String> {
private String getEvent(String eventName) {
for (String event : this) {
if (event.equals(eventName)) {
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.tango-controls</groupId>
<artifactId>JTangoParent</artifactId>
<version>JTango-9.5.17-SNAPSHOT</version>
<version>9.5.18-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>JTangoServer</artifactId>
Expand Down

0 comments on commit 12469a4

Please sign in to comment.