Skip to content

Commit

Permalink
fix(fido2): fix default properties file name
Browse files Browse the repository at this point in the history
Signed-off-by: Yuriy Movchan <[email protected]>
  • Loading branch information
yurem committed Jul 2, 2024
1 parent 39f35e4 commit b1c4dc9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class ConfigurationFactory {
private final static int DEFAULT_INTERVAL = 30; // 30 seconds

static {
if (System.getProperty("jans.base") != null) {
if (System.getProperty("gluu.base") != null) {
BASE_DIR = System.getProperty("jans.base");
} else if ((System.getProperty("catalina.base") != null) && (System.getProperty("catalina.base.ignore") == null)) {
BASE_DIR = System.getProperty("catalina.base");
Expand All @@ -96,7 +96,7 @@ public class ConfigurationFactory {
private static final String BASE_DIR;
private static final String DIR = BASE_DIR + File.separator + "conf" + File.separator;

private static final String BASE_PROPERTIES_FILE = DIR + "jans.properties";
private static final String BASE_PROPERTIES_FILE = DIR + "gluu.properties";
private static final String APP_PROPERTIES_FILE = DIR + "fido2.properties";

private final String SALT_FILE_NAME = "salt";
Expand Down
5 changes: 2 additions & 3 deletions server/src/main/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file signals an implicit bean archive (see section 15.6.2 of Weld 3.0 docs) -->
<beans version="1.1"
<beans version="1.1" bean-discovery-mode="annotated"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="all">
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd">

</beans>

0 comments on commit b1c4dc9

Please sign in to comment.