Commit 03e5d06a authored by Cristina Cocho's avatar Cristina Cocho

merge

parents 0c9433e6 ee1604d1
# Default ignored files
/shelf/
/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="NomadCommandSystem" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="NomadCommandSystem" target="1.7" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="ill-repo-releases" />
<option name="name" value="ill-repo-releases" />
<option name="url" value="https://maven.ill.fr/content/repositories/releases" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="ill-repo-snapshots" />
<option name="name" value="ill-repo-snapshots" />
<option name="url" value="https://maven.ill.fr/content/repositories/snapshots" />
</remote-repository>
<remote-repository>
<option name="id" value="ill-repo-thirdparty" />
<option name="name" value="ill-repo-thirdparty" />
<option name="url" value="https://maven.ill.fr/content/repositories/thirdparty" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.ill.fr/content/repositories/central" />
</remote-repository>
</component>
</project>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: avalon-framework:avalon-framework-impl:4.2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework-impl/4.2.0/avalon-framework-impl-4.2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework-impl/4.2.0/avalon-framework-impl-4.2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework-impl/4.2.0/avalon-framework-impl-4.2.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: com.google.protobuf:protobuf-javalite:3.12.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-javalite/3.12.1/protobuf-javalite-3.12.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-javalite/3.12.1/protobuf-javalite-3.12.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-javalite/3.12.1/protobuf-javalite-3.12.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: commons-logging:commons-logging:1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: fr.ill.ics:cameo-api:0.1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-api/0.1.9/cameo-api-0.1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-api/0.1.9/cameo-api-0.1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-api/0.1.9/cameo-api-0.1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: fr.ill.ics:cameo-com-jzmq:0.0.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-com-jzmq/0.0.3/cameo-com-jzmq-0.0.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-com-jzmq/0.0.3/cameo-com-jzmq-0.0.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-com-jzmq/0.0.3/cameo-com-jzmq-0.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: fr.ill.ics:cameo-messages:0.1.5">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-messages/0.1.5/cameo-messages-0.1.5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-messages/0.1.5/cameo-messages-0.1.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-messages/0.1.5/cameo-messages-0.1.5-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: fr.ill.ics:cameo-process-handle-default:0.0.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-process-handle-default/0.0.2/cameo-process-handle-default-0.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-process-handle-default/0.0.2/cameo-process-handle-default-0.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/cameo-process-handle-default/0.0.2/cameo-process-handle-default-0.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: fr.ill.ics:nomadcommandsystem-messages:0.0.17">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/nomadcommandsystem-messages/0.0.17/nomadcommandsystem-messages-0.0.17.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/nomadcommandsystem-messages/0.0.17/nomadcommandsystem-messages-0.0.17-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/fr/ill/ics/nomadcommandsystem-messages/0.0.17/nomadcommandsystem-messages-0.0.17-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: javax.servlet:servlet-api:2.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.3/servlet-api-2.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: logkit:logkit:2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/2.0/logkit-2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/2.0/logkit-2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/2.0/logkit-2.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.zeromq:jzmq:3.1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/zeromq/jzmq/3.1.0/jzmq-3.1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/zeromq/jzmq/3.1.0/jzmq-3.1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/zeromq/jzmq/3.1.0/jzmq-3.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/NomadCommandSystem.iml" filepath="$PROJECT_DIR$/NomadCommandSystem.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
4.0.32 dd/mm/2020
------
* Add 2 preference values to restore main window x and y.
4.0.31 13/08/2020
------
* Get NomadServerEndpoint from ServerInstance instead of ConfigManager (the latter does not take account of main/remote client types)
* Fix bug: Method to get instruments allowing PAL files used the computer name instead of the instrument name.
4.0.29 27/07/2020
------
* Correct bug command line request after token integration
4.0.28 17/07/2020
------
* Add token stuff in ploty2
* Manage specific error messages for remote computers: multiple connections per user or multiple clients per endpoint.
* Implemented the check of client (TOKEN_NOT_OWNED error)
* Client type is passed at login
4.0.27 06/07/2020
------
* Change updateImageData message for ploty version 1: give all the path of the image
* Store plotyVersion in ConfigManager.
4.0.26 01/07/2020
------
* Save endpoint in tmp dir.
4.0.25 01/07/2020
------
* Modifications to save nomad end point for remote clients in a local file.
4.0.24 28/06/2020
------
* Start always ploty2, only nomadserver run offscreen plot
4.0.23 25/06/2020
------
* Ploty2, pass instrument nomad server end point as argument
4.0.22 25/06/2020
------
* Ploty2, integrate remote nomad server endpoint
4.0.21 25/06/2020
------
* getNomadServerEndpoint return address instead of name as getServerEndpoint
* Use new protocol buf 3.12.1
4.0.20 16/06/2020
------
* sendCrashMail method added in SessionManager.
* DataPlotMessages.java removed.
* Proto generation removed and added dependency to NomadCommandSystemMessages.
4.0.19 11/06/2020
------
* Try to fix bug in remote clients blocking on: "Trying to connect command line subscriber to command_line_publisher".
4.0.18 10/06/2020
------
* View state synchronisation between Nomad clients.
4.0.16 09/06/2020
------
* Get ploty version from nomad server.
4.0.15 05/06/2020
------
* Corrected blocking when exiting.
4.0.14 04/06/2020
------
* deploy again, bug on previous one.
4.0.13 04/06/2020
------
* add null ptr test.
4.0.12 29/05/2020
------
* ...
4.0.11 28/05/2020
------
* Remove leading and trailing whitespace omitted in properties.
4.0.10 20/05/2020
------
* Correct bug for null ptr in contruction of local setting directory
4.0.9 19/05/2020
-----
* VirtualHome was set after properties reading
4.0.8 19/05/2020
-----
* Pass property names to ploty2 instead of ids
4.0.7 23/04/2020
-----
* Merge ploty2 branch
4.0.6 22/04/2020
-----
* Dependencies to cameo updated.
4.0.5 21/04/2020
-----
* Dependencies to cameo updated.
4.0.4 20/04/2020
-----
* Add parameter 'addServerHome' to method saveFile in ResourceManager.
4.0.3 20/04/2020
-----
* Chat files are located on server side: do not create a directory in virtual homes.
4.0.2 17/04/2020
-----
* Allow virtual clients to set their own home directory
4.0.1 16/04/2020
-----
* Correctly set nomadServerEndPoint when running in remote mode
4.0.0
-----
* Remote control management
3.4.0 05/02/2020
-----
* Token management
* Chat
3.3.3 13/01/2020
-----
* Remove test on containerId in Property.getServerValue because it has an unexplained side-effect (notably for ParameterizableScan1D)
3.3.2 07/01/2020
-----
* Add createDirectory method in ResourceManager and CommandZoneAccessor classes.
3.3.1 25/11/2019
-----
* Synchronise delete scan for multi clients.
* Synchronise clients for XBU and PAL files.
* Synchronise list of users' scripts and settings files between Nomad.
* Merged V3.2.
3.2.6 18/10/2019
-----
* Do not access to the command zone value of a property when its containerId is 0 but the database value.
* Reviewed the ServerControlCommandBox hierarchy and removed thenBlock argument.
3.2.5 08/07/2019
------
* Moved Property.ExpressionResult to expression package so that it is accessible to other classes.
3.2.4 14/06/2019
------
* Re-added the client check of a property value in the AutoApplyState that had been removed in the previous version.
3.2.3 07/06/2019
------
* Removed checkValue in AutoApplyState.setValue. Otherwise setting an hexadecimal value is not possible because the value is verified as an expression by the server.
3.2.2 04/06/2019
------
* Added GetWholeDynamicProperties request to get the alias of dynamic properties.
......
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
<src_description expected_position="2">
<src_folder value="file://$MODULE_DIR$/src/main/java" expected_position="0" />
<src_folder value="file://$MODULE_DIR$/src/test/resources" expected_position="1" />
<src_folder value="file://$MODULE_DIR$/src/test/java" expected_position="4" />
</src_description>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="jdk" jdkName="JavaSE-1.7" jdkType="JavaSDK" />
<orderEntry type="library" name="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" level="application" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
<orderEntry type="library" name="Maven: avalon-framework:avalon-framework-impl:4.2.0" level="project" />
<orderEntry type="library" name="Maven: logkit:logkit:2.0" level="project" />
<orderEntry type="library" name="Maven: fr.ill.ics:nomadcommandsystem-messages:0.0.17" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-javalite:3.12.1" level="project" />
<orderEntry type="library" name="Maven: fr.ill.ics:cameo-api:0.1.9" level="project" />
<orderEntry type="library" name="Maven: fr.ill.ics:cameo-messages:0.1.5" level="project" />
<orderEntry type="library" name="Maven: fr.ill.ics:cameo-process-handle-default:0.0.2" level="project" />
<orderEntry type="library" name="Maven: fr.ill.ics:cameo-com-jzmq:0.0.3" level="project" />
<orderEntry type="library" name="Maven: org.zeromq:jzmq:3.1.0" level="project" />
</component>
</module>
\ No newline at end of file
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId>
<version>3.2.2</version>
<version>4.0.32-SNAPSHOT</version>
<name>NomadCommandSystem</name>
<description>Java bridge for the communication with the Nomad server</description>
<scm>
......@@ -42,6 +42,12 @@
</properties>
<dependencies>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-client</artifactId>
<version>3.1.10</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
......@@ -52,38 +58,38 @@
<artifactId>logkit</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem-messages</artifactId>
<version>0.0.18-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-lite</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>cameo-api</artifactId>
<version>0.1.4</version>
<version>0.1.9</version>
<exclusions>
<exclusion>
<groupId>fr.ill.ics</groupId>
<artifactId>cameo-com-jeromq</artifactId>
<artifactId>cameo-com-jeromq</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>cameo-com-jzmq</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<!-- We force the compilation with 1.7 to ensure SUSE and Android execution -->
<!-- We force the compilation with 1.8 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
......@@ -123,81 +129,7 @@
</archive>
</configuration>
</plugin>
<!-- We generate the sources from IDL and proto in process-resources to ensure to have them before the compile phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<target>
<property name="protoFlags" value="-I${env.NOMAD_HOME}/src/common/protobuf/proto --java_out=src/main/java" />
<property name="protoDir" value="${env.NOMAD_HOME}/src/common/protobuf/proto" />
<delete dir="src/main/java/fr/ill/ics/nomadserver" />
<!-- proto files -->
<echo message="Generating ServantConfiguration.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ServantConfiguration.proto" />
</exec>
<echo message="Generating NotificationMessages.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/NotificationMessages.proto" />
</exec>
<echo message="Generating CommonResponses.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/CommonResponses.proto" />
</exec>
<echo message="Generating DatabaseRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/DatabaseRequests.proto" />
</exec>
<echo message="Generating ServantManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ServantManagerRequests.proto" />
</exec>
<echo message="Generating CommandLineRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/CommandLineRequests.proto" />
</exec>
<echo message="Generating VariableManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/VariableManagerRequests.proto" />
</exec>
<echo message="Generating ConditionManagerRequests.java" />
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ConditionManagerRequests.proto" />
</exec>
<echo message="Generating CommandZoneRequests.java" />
<exec executable="protoc">