Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SnapArchivingApi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango controls archiving
SnapArchivingApi
Commits
b71b397e
Commit
b71b397e
authored
4 years ago
by
Gwenaelle ABEILLE
Browse files
Options
Downloads
Patches
Plain Diff
fix update of user/pwd that is no more working with new pool hikaricp
parent
2ba96da7
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#366
failed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
+40
-75
40 additions, 75 deletions
...p/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
with
40 additions
and
75 deletions
src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
+
40
−
75
View file @
b71b397e
/* Synchrotron Soleil
*
* File : ClasspathDAOBeansLoader.java
*
* Project : javaapi
*
* Description :
*
* Author : CLAISSE
*
* Original : 6 avr. 07
*
* Revision: Author:
* Date: State:
*
* Log: ClasspathDAOBeansLoader.java,v
*
*/
/*
* Created on 6 avr. 07
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package
fr.soleil.archiving.snap.api.persistence.spring.dao
;
package
fr.soleil.archiving.snap.api.persistence.spring.dao
;
import
org.slf4j.ext.XLogger
;
import
org.slf4j.ext.XLoggerFactory
;
import
org.springframework.beans.factory.BeanFactory
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.support.ClassPathXmlApplicationContext
;
import
com.zaxxer.hikari.HikariDataSource
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Im1Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Im1Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Im2Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Im2Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.ScNum1Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.ScNum1Val
;
...
@@ -40,6 +8,11 @@ import fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr1Val;
...
@@ -40,6 +8,11 @@ import fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr1Val;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr2Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.ScStr2Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Sp1Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Sp1Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Sp2Val
;
import
fr.soleil.archiving.snap.api.persistence.spring.dto.Sp2Val
;
import
org.slf4j.ext.XLogger
;
import
org.slf4j.ext.XLoggerFactory
;
import
org.springframework.beans.factory.BeanFactory
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.support.ClassPathXmlApplicationContext
;
public
class
ClasspathDAOBeansLoader
implements
DAOBeansLoader
{
public
class
ClasspathDAOBeansLoader
implements
DAOBeansLoader
{
final
static
XLogger
logger
=
XLoggerFactory
.
getXLogger
(
ClasspathDAOBeansLoader
.
class
);
final
static
XLogger
logger
=
XLoggerFactory
.
getXLogger
(
ClasspathDAOBeansLoader
.
class
);
...
@@ -61,18 +34,10 @@ public class ClasspathDAOBeansLoader implements DAOBeansLoader {
...
@@ -61,18 +34,10 @@ public class ClasspathDAOBeansLoader implements DAOBeansLoader {
boolean
defaultResource
=
_resourceName
==
null
||
_resourceName
.
trim
().
length
()
==
0
;
boolean
defaultResource
=
_resourceName
==
null
||
_resourceName
.
trim
().
length
()
==
0
;
this
.
resourceName
=
defaultResource
?
DEFAULT_BEANS_FILE_NAME
:
_resourceName
;
this
.
resourceName
=
defaultResource
?
DEFAULT_BEANS_FILE_NAME
:
_resourceName
;
logger
.
info
(
"configure hibernate resource: "
+
resourceName
);
logger
.
info
(
"configure hibernate resource: "
+
resourceName
);
System
.
setProperty
(
"user"
,
userName
);
System
.
setProperty
(
"password"
,
password
);
applicationContext
=
new
ClassPathXmlApplicationContext
(
this
.
resourceName
);
applicationContext
=
new
ClassPathXmlApplicationContext
(
this
.
resourceName
);
instantiateBeans
(
applicationContext
);
if
(
applicationContext
.
getBean
(
"dataSource"
)
instanceof
HikariDataSource
)
{
HikariDataSource
datasource
=
(
HikariDataSource
)
applicationContext
.
getBean
(
"dataSource"
);
logger
.
info
(
"Hibernate dataSource url: "
+
datasource
.
getJdbcUrl
());
logger
.
info
(
"configure dataSource userName from device: "
+
userName
);
logger
.
info
(
"configure dataSource password from device: "
+
password
);
datasource
.
setUsername
(
userName
);
datasource
.
setPassword
(
password
);
}
this
.
instantiateBeans
(
applicationContext
);
logger
.
exit
();
logger
.
exit
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment