Fix datasource list retrieval

Signed-off-by: Alexander Pinchuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Nov 15, 2022 · a754349 · a754349
1 parent 0aeef68
commit a754349
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java b/...ors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java
@@ -85,7 +85,7 @@ public class DriverLoader implements ConnectorConstants {
             System.getProperty(ConnectorConstants.INSTALL_ROOT) + File.separator +
             "lib" + File.separator + "install" + File.separator + "databases" +
             File.separator + "dbvendormapping" + File.separator;
-    private final static String DS_PROPERTIES = "dataStructure.properties";
+    private final static String DS_PROPERTIES = "ds.properties";
     private final static String CPDS_PROPERTIES = "cpds.properties";
     private final static String XADS_PROPERTIES = "xads.properties";
     private final static String DRIVER_PROPERTIES = "driver.properties";

diff --git a/...bc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java b/...bc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java
@@ -71,7 +71,7 @@ public class JdbcAdminServiceImpl extends ConnectorService {
         "dbvendormapping" + File.separator;
 
     private final static String JDBC40_CONNECTION_VALIDATION = "org.glassfish.api.jdbc.validation.JDBC40ConnectionValidation";
-    private final static String DS_PROPERTIES = "dataStructure.properties";
+    private final static String DS_PROPERTIES = "ds.properties";
     private final static String CPDS_PROPERTIES = "cpds.properties";
     private final static String XADS_PROPERTIES = "xads.properties";
     private final static String DRIVER_PROPERTIES = "driver.properties";