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

Timestamp:

2013-03-13T14:13:21+13:00 (11 years ago)

Author:

sjm84

Message:

Reformatting this file ahead of some changes

File:

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

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

@@ -128 +128 @@
 
     protected static DerbyWrapper _derbyWrapper = null;
-        protected static boolean _derbyWrapperDoneForcedShutdown = false;
+    protected static boolean _derbyWrapperDoneForcedShutdown = false;
 
     protected String _recaptchaPrivateKey = null;
@@ -138 +138 @@
     }
 
-        public void cleanUp() {
-
-        super.cleanUp();
-
-        if (!_derbyWrapperDoneForcedShutdown) {     
-
-        // This boolean is used to ensure we always shutdown the derby server, even if it is never
-        // used by the Authentication server.  This is because the Tomcat greenstone3.xml
-        // config file also specifies a connection to the database, which can result in the
-        // server being initialized when the servlet is first accessed.  Note also, 
-        // Authentication is a ServiceRack, meaning cleanUp() is called for each service
-        // supported, however we only need to shutdown the Derby server once.  Again
-        // this boolean variable helps achieve this.
-
-        logger.info("Authentication Service performing forced shutdown of Derby Server ...");
-        
-        DerbyWrapper.shutdownDatabaseServer();
-        _derbyWrapper = null;
-        _derbyWrapperDoneForcedShutdown = true;
-        }
+    public void cleanUp()
+    {
+
+        super.cleanUp();
+
+        if (!_derbyWrapperDoneForcedShutdown)
+        {
+
+            // This boolean is used to ensure we always shutdown the derby server, even if it is never
+            // used by the Authentication server.  This is because the Tomcat greenstone3.xml
+            // config file also specifies a connection to the database, which can result in the
+            // server being initialized when the servlet is first accessed.  Note also, 
+            // Authentication is a ServiceRack, meaning cleanUp() is called for each service
+            // supported, however we only need to shutdown the Derby server once.  Again
+            // this boolean variable helps achieve this.
+
+            logger.info("Authentication Service performing forced shutdown of Derby Server ...");
+
+            DerbyWrapper.shutdownDatabaseServer();
+            _derbyWrapper = null;
+            _derbyWrapperDoneForcedShutdown = true;
+        }
 
     }
@@ -282 +284 @@
         try
         {
-                UserQueryResult userQueryResult = _derbyWrapper.findUser(username);
-            
+            UserQueryResult userQueryResult = _derbyWrapper.findUser(username);
+
             Vector<UserTermInfo> terms = userQueryResult.getUserTerms();
 
@@ -314 +316 @@
             ex.printStackTrace();
         }
-
 
         closeDatabase();
@@ -828 +829 @@
     private void checkAdminUserExists()
     {
-            openDatabase();
+        openDatabase();
 
         UserQueryResult userQueryResult = _derbyWrapper.findUser(null, null);
@@ -856 +857 @@
     private boolean openDatabase()
     {
-        if (_derbyWrapper == null) {
-        _derbyWrapper = new DerbyWrapper();
-
-        // 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";
-        File usersDB_file = new File(usersDB_dir);
-        if (!usersDB_file.exists())
-        {
-            String etc_dir = this.site_home + 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 " + this.site_home + ".");
-                    return false;
-                }
-            }
-            _derbyWrapper.connectDatabase(usersDB_dir, true);
-            _derbyWrapper.createDatabase();
-        }
-        else
-        {
-            _derbyWrapper.connectDatabase(usersDB_dir, false);
-        }
-        }
-        return true;
+        if (_derbyWrapper == null)
+        {
+            _derbyWrapper = new DerbyWrapper();
+
+            // 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";
+            File usersDB_file = new File(usersDB_dir);
+            if (!usersDB_file.exists())
+            {
+                String etc_dir = this.site_home + 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 " + this.site_home + ".");
+                        return false;
+                    }
+                }
+                _derbyWrapper.connectDatabase(usersDB_dir, true);
+                _derbyWrapper.createDatabase();
+            }
+            else
+            {
+                _derbyWrapper.connectDatabase(usersDB_dir, false);
+            }
+        }
+        return true;
     }
 
@@ -896 +898 @@
 
     private int addUserInformationToNode(String username, Element serviceNode)
-    {       
-            openDatabase();
+    {
+        openDatabase();
 
         UserQueryResult userQueryResult = _derbyWrapper.findUser(username, null);
@@ -926 +928 @@
         if (success)
         {
-            closeDatabase();
-            return NO_ERROR;
+            closeDatabase();
+            return NO_ERROR;
         }
 
@@ -936 +938 @@
     private int addUser(String newUsername, String newPassword, String newGroups, String newStatus, String newComment, String newEmail)
     {
-            openDatabase();
+        openDatabase();
 
         newGroups = newGroups.replaceAll(" ", "");
@@ -965 +967 @@
     private boolean checkUserExists(String username)
     {
-            boolean check_status = false;
+        boolean check_status = false;
 
         openDatabase();
@@ -981 +983 @@
         catch (Exception ex)
         {
-            // some error occurred accessing the database
-            ex.printStackTrace();
+            // some error occurred accessing the database
+            ex.printStackTrace();
         }
 
@@ -991 +993 @@
     private String retrieveDataForUser(String username, String dataType)
     {
-            openDatabase();
+        openDatabase();
 
         String data = null;