Skip to content
Snippets Groups Projects
Commit 4444ee58 authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

release historicalarchivingservers-2.6.1

parent 2a8fc946
No related branches found
No related merge requests found
Showing
with 4981 additions and 4895 deletions
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.soleil.deviceservers</groupId>
<artifactId>historicalarchivingservers</artifactId>
<version>2.6.1</version>
</parent>
<groupId>fr.soleil.deviceservers</groupId>
<artifactId>archiving-common-collector</artifactId>
<developers>
<developer>
<id>girardot</id>
<name>Raphaël GIRARDOT</name>
<email>raphael.girardot@synchrotron-soleil.fr</email>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>Java Developer</role>
</roles>
<timezone>1</timezone>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>fr.esrf.atk</groupId>
<artifactId>ATKCore</artifactId>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.soleil.deviceservers</groupId>
<artifactId>historicalarchivingservers</artifactId>
<version>2.6.1</version>
</parent>
<groupId>fr.soleil.deviceservers</groupId>
<artifactId>archivingmanager</artifactId>
<developers>
<developer>
<id>girardot</id>
<name>Raphaël GIRARDOT</name>
<email>raphael.girardot@synchrotron-soleil.fr</email>
<organization>Synchrotron Soleil</organization>
<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
<roles>
<role>Java Developer</role>
</roles>
<timezone>1</timezone>
</developer>
</developers>
<dependencies>
<!--OLD ARCHIVER NEEDS IT dependency -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.tango</groupId>
<artifactId>JTangoServer</artifactId>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
...@@ -123,6 +123,7 @@ package ArchivingManager; ...@@ -123,6 +123,7 @@ package ArchivingManager;
import java.util.Arrays; import java.util.Arrays;
import fr.soleil.database.connection.DataBaseParameters;
import org.omg.CORBA.SystemException; import org.omg.CORBA.SystemException;
import org.omg.CORBA.UserException; import org.omg.CORBA.UserException;
import org.tango.utils.DevFailedUtils; import org.tango.utils.DevFailedUtils;
...@@ -399,9 +400,9 @@ public class ArchivingManager extends DeviceImpl ...@@ -399,9 +400,9 @@ public class ArchivingManager extends DeviceImpl
protected boolean connectHdb(StringBuilder statusBuilder) { protected boolean connectHdb(StringBuilder statusBuilder) {
boolean hdbAvailable; boolean hdbAvailable;
try { try {
AbstractDataBaseConnector hdbConnector = ConnectionFactory.connectThroughTango("HdbManager", DataBaseParameters parameters = new DataBaseParameters();
ConfigConst.HDB_CLASS_DEVICE, hdbHost, hdbName, hdbSchema, hdbUser, hdbPassword, null, null, parameters.setParametersFromTango(ConfigConst.HDB_CLASS_DEVICE);
hdbRacConnection, false, true); AbstractDataBaseConnector hdbConnector = ConnectionFactory.connect(parameters);
hdbManager = ArchivingManagerApiRefFactory.getInstance(true, hdbConnector); hdbManager = ArchivingManagerApiRefFactory.getInstance(true, hdbConnector);
hdbManager.archivingConfigure(); hdbManager.archivingConfigure();
hdbAvailable = true; hdbAvailable = true;
...@@ -420,9 +421,9 @@ public class ArchivingManager extends DeviceImpl ...@@ -420,9 +421,9 @@ public class ArchivingManager extends DeviceImpl
protected boolean connectTdb(StringBuilder statusBuilder) { protected boolean connectTdb(StringBuilder statusBuilder) {
boolean tdbAvailable; boolean tdbAvailable;
try { try {
AbstractDataBaseConnector tdbConnector = ConnectionFactory.connectThroughTango("TdbManager", DataBaseParameters parameters = new DataBaseParameters();
ConfigConst.TDB_CLASS_DEVICE, tdbHost, tdbName, tdbSchema, tdbUser, tdbPassword, null, null, parameters.setParametersFromTango(ConfigConst.TDB_CLASS_DEVICE);
tdbRacConnection, false, true); AbstractDataBaseConnector tdbConnector = ConnectionFactory.connect(parameters);
tdbManager = ArchivingManagerApiRefFactory.getInstance(false, tdbConnector); tdbManager = ArchivingManagerApiRefFactory.getInstance(false, tdbConnector);
tdbManager.archivingConfigure(); tdbManager.archivingConfigure();
tdbAvailable = true; tdbAvailable = true;
...@@ -713,9 +714,9 @@ public class ArchivingManager extends DeviceImpl ...@@ -713,9 +714,9 @@ public class ArchivingManager extends DeviceImpl
IArchivingManagerApiRef previousHdbManager = hdbManager; IArchivingManagerApiRef previousHdbManager = hdbManager;
try { try {
String hdbUser = argin[0], hdbPassword = argin[1]; String hdbUser = argin[0], hdbPassword = argin[1];
AbstractDataBaseConnector hdbConnector = ConnectionFactory.connectThroughTango("HdbManager", DataBaseParameters parameters = new DataBaseParameters();
ConfigConst.HDB_CLASS_DEVICE, hdbHost, hdbName, hdbSchema, hdbUser, hdbPassword, null, null, parameters.setParametersFromTango(ConfigConst.HDB_CLASS_DEVICE);
hdbRacConnection, false, true); AbstractDataBaseConnector hdbConnector = ConnectionFactory.connect(parameters);
hdbManager = ArchivingManagerApiRefFactory.getInstance(true, hdbConnector); hdbManager = ArchivingManagerApiRefFactory.getInstance(true, hdbConnector);
hdbManager.archivingConfigure(); hdbManager.archivingConfigure();
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
...@@ -738,9 +739,9 @@ public class ArchivingManager extends DeviceImpl ...@@ -738,9 +739,9 @@ public class ArchivingManager extends DeviceImpl
IArchivingManagerApiRef previousTdbManager = tdbManager; IArchivingManagerApiRef previousTdbManager = tdbManager;
try { try {
String tdbUser = argin[2], tdbPassword = argin[3]; String tdbUser = argin[2], tdbPassword = argin[3];
AbstractDataBaseConnector tdbConnector = ConnectionFactory.connectThroughTango("TdbManager", DataBaseParameters parameters = new DataBaseParameters();
ConfigConst.TDB_CLASS_DEVICE, tdbHost, tdbName, tdbSchema, tdbUser, tdbPassword, null, null, parameters.setParametersFromTango(ConfigConst.TDB_CLASS_DEVICE);
tdbRacConnection, false, false); AbstractDataBaseConnector tdbConnector = ConnectionFactory.connect(parameters);
tdbManager = ArchivingManagerApiRefFactory.getInstance(true, tdbConnector); tdbManager = ArchivingManagerApiRefFactory.getInstance(true, tdbConnector);
tdbManager.archivingConfigure(); tdbManager.archivingConfigure();
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment