xsi:noNamespaceSchemaLocation="../../defs/technical-component-definition.xsd">
<name>auth-std-db</name>
<description>Authentification avancée permettant de gérer les droits finement</description>
- <release>5.0.0.6</release>
+ <release>5.0.0.6+</release>
<url>http://xemelios.org/updatesV5/auth-std-db</url>
<type>COMPOSANT</type>
<destination>
<component-ref url="http://xemelios.org/updatesV5/swing-utils" release="5.0.0.0"/>
</requires>
<release-notes>
+ <note visibility="editeur">Correction FAP-MiniFin-Xemelios-0051</note>
<release v="5.0.0.6">
<note visibility="public">Possibilité d'aller chercher des collectivités dans le référentiel SPL</note>
<note visibility="public">Panneau des utilisateurs: la recherche se déclenche quand on saisit ENTER dans le champ de filtrage des utilisateurs</note>
*/
package fr.gouv.finances.dgfip.xemelios.auth;
+import fr.gouv.finances.cp.utils.PropertiesExpansion;
import fr.gouv.finances.dgfip.xemelios.auth.impl.std.db.ui.DlgConfigAuthentication;
import fr.gouv.finances.dgfip.xemelios.data.impl.pool.PoolManager;
import java.io.File;
}
Properties props = new Properties();
Connection con = null;
+ PropertiesExpansion applicationProperties = new PropertiesExpansion();
+ try {
+ File xemeliosPropertiesFile = new File(localDir.getParentFile(),"xemelios.properties");
+ applicationProperties.load(new FileInputStream(xemeliosPropertiesFile));
+ } catch(Exception ex) {
+ // on ne fait rien
+ applicationProperties = new PropertiesExpansion();
+ }
try {
props.load(new FileInputStream(propertyFile));
PoolManager.getInstance().init(props);
if(rs.next()) {
initialEngineName = rs.getString(1);
}
- DlgConfigAuthentication dlg = new DlgConfigAuthentication(null, true,initialEngineName);
+ DlgConfigAuthentication dlg = new DlgConfigAuthentication(null, true,initialEngineName, applicationProperties);
dlg.run();
dlg.dispose();
} catch(Exception ex) {
*/
package fr.gouv.finances.dgfip.xemelios.auth.impl.std.db.ui;
+import fr.gouv.finances.cp.utils.PropertiesExpansion;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import javax.swing.AbstractAction;
* @param modal
* @param initialAuthenticationEngine
*/
- public DlgConfigAuthentication(java.awt.Frame parent, boolean modal, String initialAuthenticationEngine) {
+ public DlgConfigAuthentication(java.awt.Frame parent, boolean modal, String initialAuthenticationEngine, PropertiesExpansion applicationProperties) {
super(parent, modal);
this.initialEngineName = initialAuthenticationEngine;
initComponents();
- authPanel = new PnlConfigAuthentication(initialEngineName);
+ authPanel = new PnlConfigAuthentication(initialEngineName, applicationProperties);
innerPnl.add(authPanel);
setLocationRelativeTo(parent);
}
package fr.gouv.finances.dgfip.xemelios.auth.impl.std.db.ui;
+import fr.gouv.finances.cp.utils.PropertiesExpansion;
import fr.gouv.finances.dgfip.xemelios.auth.AuthEngine;
+import fr.gouv.finances.dgfip.xemelios.common.Constants;
import fr.gouv.finances.dgfip.xemelios.data.impl.pool.PoolManager;
import fr.gouv.finances.dgfip.xemelios.utils.XemeliosUtils;
import java.net.URL;
private static EngineListModel engines;
private Engine currentEngine = null;
private PropsTableModel model = null;
+ private PropertiesExpansion applicationProperties;
static {
engines = new EngineListModel();
// Pas d'authentification à mettre en pos 1
* Crée un nouveau panneau de configuration de l'authentification
* @param initialAuthenticationEngine
*/
- public PnlConfigAuthentication(String initialAuthenticationEngine) {
+ public PnlConfigAuthentication(String initialAuthenticationEngine, PropertiesExpansion applicationProperties) {
+ this.applicationProperties = applicationProperties;
Engine initialEngine = null;
if(initialAuthenticationEngine!=null) {
for(Engine eng:engines) {
initComponents();
cbxEngine.setSelectedItem(initialEngine);
Connection con = PoolManager.getInstance().getConnection();
- if(!XemeliosUtils.isLocalComputerServer(con)) {
+ if(!XemeliosUtils.isLocalComputerServer(con) && !"true".equals(applicationProperties.getProperty(Constants.SYS_PROP_FORCE_AUTH_CFG))) {
cbxEngine.setEnabled(false);
}
PoolManager.getInstance().releaseConnection(con);