Changeset 28120 for main/trunk/greenstone3

Timestamp:

2013-08-22T17:14:03+12:00 (11 years ago)

Author:

sjm84

Message:

Should be web/etc not [sitename]/etc

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -20 +20 @@
 import org.greenstone.gsdl3.util.UserQueryResult;
 import org.greenstone.gsdl3.util.UserTermInfo;
+import org.greenstone.util.GlobalProperties;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -880 +881 @@
 
             // check the usersDb database, if it isn't existing, check the etc dir, create the etc dir if it isn't existing, then create the  user database and add a "admin" user
-            String usersDB_dir = this.site_home + File.separatorChar + "etc" + File.separatorChar + "usersDB";
+            String usersDB_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + "usersDB";
             File usersDB_file = new File(usersDB_dir);
             if (!usersDB_file.exists())
             {
-                String etc_dir = this.site_home + File.separatorChar + "etc";
+                String etc_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc";
                 File etc_file = new File(etc_dir);
                 if (!etc_file.exists())
@@ -891 +892 @@
                     if (!success)
                     {
-                        logger.error("Couldn't create the etc dir under " + this.site_home + ".");
+                        logger.error("Couldn't create the etc dir under " + GlobalProperties.getGSDL3Home() + ".");
                         return false;
                     }