Changeset 38856 for main/trunk/greenstone3/src

Timestamp:

2024-03-21T20:02:29+13:00 (8 weeks ago)

Author:

anupama

Message:

Testing if usersDB exists should use the full path. There was an error message about no driver being found for the jdbc url going into the tomcat log that I hadn't noticed before. This is because createDatabaseIfNeeded tested if usersDB existed, and if not tried to create it. The problem was that the file usersDB that it tested for existence is now being created with the relative string of usersDB instead of the full path inside web/etc, so it couldn't locate that.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

@@ -33 +33 @@
 import org.greenstone.util.GlobalProperties;
 
+import org.apache.log4j.*;
 /**
  * The UserDB stores the groups in the "roles" table in expanded form, i.e. expandedGroups.
@@ -42 +43 @@
     static final String PORT;
     static final String DERBYSERVER;
-    static final String PROTOCOL;   
-
+    static final String PROTOCOL;
+    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.DerbyWrapper.class.getName());
     static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
     static final String USERSDB = "usersDB";
@@ -104 +105 @@
         protocol_str = PROTOCOL + USERSDB_DIR;
         File usersDB_file = new File(USERSDB_DIR);
+
+        // to test for file existence, ensure we have full path to it,
+        // as "usersDB" on its own may not exist at the level we're testing this from
+        if(!USERSDB_DIR.startsWith(GlobalProperties.getGSDL3Home())) {
+            usersDB_file = new File(GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + USERSDB_DIR);
+        }
+        
         if (!usersDB_file.exists())
         {
@@ -118 +126 @@
             try
             {
+                //Class.forName(DRIVER).getDeclaredConstructor().newInstance();
                 DerbyWrapper.createDatabase(DriverManager.getConnection(protocol_str + ";create=true"));
             }