Changeset 28218

Timestamp:

2013-09-05T12:35:09+12:00 (11 years ago)

Author:

sjm84

Message:

Should now create a database on server start

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• service/Authentication.java (modified) (2 diffs)
• util/DerbyWrapper.java (modified) (5 diffs)

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

@@ -177 +177 @@
         this.short_service_info.appendChild(getUserInformation_service);
 
+        DerbyWrapper.createDatabaseIfNeeded();
+        
         NodeList recaptchaElems = info.getElementsByTagName("recaptcha");
-
         for (int i = 0; i < recaptchaElems.getLength(); i++)
         {
@@ -847 +848 @@
         // 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 = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + "usersDB";
-
         DerbyWrapper derbyWrapper = new DerbyWrapper(usersDB_dir);
-
-        File usersDB_file = new File(usersDB_dir);
-        if (!usersDB_file.exists())
-        {
-            String etc_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc";
-            File etc_file = new File(etc_dir);
-            if (!etc_file.exists())
-            {
-                boolean success = etc_file.mkdir();
-                if (!success)
-                {
-                    logger.error("Couldn't create the etc dir under " + GlobalProperties.getGSDL3Home() + ".");
-                    return null;
-                }
-            }
-            derbyWrapper.createDatabase();
-        }
-
         return derbyWrapper;
     }

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

@@ -19 +19 @@
 package org.greenstone.gsdl3.util;
 
+import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -30 +31 @@
 
 import org.greenstone.gsdl3.service.Authentication;
+import org.greenstone.util.GlobalProperties;
 
 public class DerbyWrapper
@@ -40 +42 @@
     static final String DATA = "data";
     private Connection conn = null;
-    private String protocol_str;
+    private static String protocol_str;
 
     public DerbyWrapper(String dbpath)
     {
         connectDatabase(dbpath, false);
+    }
+
+    public static void createDatabaseIfNeeded()
+    {
+        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 = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc";
+            File etc_file = new File(etc_dir);
+            if (!etc_file.exists())
+            {
+                boolean success = etc_file.mkdir();
+                if (!success)
+                {
+                    System.err.println("Couldn't create the etc dir under " + GlobalProperties.getGSDL3Home() + ".");
+                }
+            }
+            try
+            {
+                DerbyWrapper.createDatabase(DriverManager.getConnection(protocol_str + ";create=true"));
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
     }
 
@@ -154 +183 @@
     }
 
-    public void createDatabase()
+    public static void createDatabase(Connection conn)
     {
         try
@@ -169 +198 @@
             conn.commit();
             state.close();
+            conn.close();
         }
         catch (Exception ex)