svn commit: r1688079 - /manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java

[kwright]

Author: kwright
Date: Sun Jun 28 23:48:30 2015
New Revision: 1688079

URL: http://svn.apache.org/r1688079
Log:
Remove unused code

Modified:
    
manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java

Modified: 
manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1688079&r1=1688078&r2=1688079&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1131/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
 Sun Jun 28 23:48:30 2015
@@ -128,17 +128,6 @@ public class ManifoldCF
   /** Process ID - cannot exceed 16 characters */
   public static final String processIDProperty = 
"org.apache.manifoldcf.processid";
   
-  // Admin properties
-  /** UI login user name */
-  public static final String loginUserNameProperty = 
"org.apache.manifoldcf.login.name";
-  /** UI login password */
-  public static final String loginPasswordProperty = 
"org.apache.manifoldcf.login.password";
-
-  /** API login user name */
-  public static final String apiLoginUserNameProperty = 
"org.apache.manifoldcf.apilogin.name";
-  /** API login password */
-  public static final String apiLoginPasswordProperty = 
"org.apache.manifoldcf.apilogin.password";
-
   // Database access properties
   /** Database name property */
   public static final String masterDatabaseNameProperty = 
"org.apache.manifoldcf.database.name";
@@ -200,10 +189,6 @@ public class ManifoldCF
         // Clean up the system doing the same thing the shutdown thread would 
have if the process was killed
         cleanUpEnvironment(threadContext);
         processID = null;
-        loginUserName = null;
-        loginPassword = null;
-        apiLoginUserName = null;
-        apiLoginPassword = null;
         masterDatabaseName = null;
         masterDatabaseUsername = null;
         masterDatabasePassword = null;
@@ -294,12 +279,6 @@ public class ManifoldCF
           Logging.initializeLoggers();
           Logging.setLogLevels(threadContext);
 
-          loginUserName = 
LockManagerFactory.getStringProperty(threadContext,loginUserNameProperty,"admin");
-          loginPassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,loginPasswordProperty,"admin");
-
-          apiLoginUserName = 
LockManagerFactory.getStringProperty(threadContext,apiLoginUserNameProperty,"");
-          apiLoginPassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,apiLoginPasswordProperty,"");
-
           masterDatabaseName = 
LockManagerFactory.getStringProperty(threadContext,masterDatabaseNameProperty,"dbname");
           masterDatabaseUsername = 
LockManagerFactory.getStringProperty(threadContext,masterDatabaseUsernameProperty,"manifoldcf");
           masterDatabasePassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,masterDatabasePasswordProperty,"local_pg_passwd");
@@ -709,44 +688,6 @@ public class ManifoldCF
     }
   }
 
-  /** Verify API login.
-  */
-  public static boolean verifyAPILogin(IThreadContext threadContext, String 
userID, String userPassword)
-    throws ManifoldCFException
-  {
-    if (userID != null && userPassword != null)
-    {
-      /*
-      IDBInterface database = DBInterfaceFactory.make(threadContext,
-        ManifoldCF.getMasterDatabaseName(),
-        ManifoldCF.getMasterDatabaseUsername(),
-        ManifoldCF.getMasterDatabasePassword());
-      */
-      // MHL to use a database table, when we get that sophisticated
-      return userID.equals(apiLoginUserName) &&  
userPassword.equals(apiLoginPassword);
-    }
-    return false;
-  }
-
-  /** Verify login.
-  */
-  public static boolean verifyLogin(IThreadContext threadContext, String 
userID, String userPassword)
-    throws ManifoldCFException
-  {
-    if (userID != null && userPassword != null)
-    {
-      /*
-      IDBInterface database = DBInterfaceFactory.make(threadContext,
-        ManifoldCF.getMasterDatabaseName(),
-        ManifoldCF.getMasterDatabaseUsername(),
-        ManifoldCF.getMasterDatabasePassword());
-      */
-      // MHL to use a database table, when we get that sophisticated
-      return userID.equals(loginUserName) &&  
userPassword.equals(loginPassword);
-    }
-    return false;
-  }
-  
   protected static final int IV_LENGTH = 16;
 
   protected static String getSaltValue(IThreadContext threadContext)