/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 4805

Added by daigle almost 16 years ago

Separate the concept of a backup file location and a metacat external directory location. These can be totally different.

     			setRecommendedExternalDir(recommendedExternalDir);
     			String backupPath = getProperty("application.backupDir");
     			Boolean backupPathExisted = backupPath != null && !backupPath.equals("");
     			if (!backupPathExisted && recommendedExternalDir != null) {
     				String realApplicationContext =
     					ServiceService.getRealApplicationContext();
     			if (backupPath == null || backupPath.equals("")) {
     				backupPath = SystemUtil.getStoredBackupDir();
+    			}
     			if (backupPath == null || backupPath.equals("") && recommendedExternalDir != null) {
     				backupPath =
     					recommendedExternalDir + FileUtil.getFS() + "." + realApplicationContext;
     					recommendedExternalDir + FileUtil.getFS() + "." + ServiceService.getRealApplicationContext();
+    			}
     			// if backupPath is still null, no reason to initialize the
     			// backup properties. The system will need to prompt the user for
     			// the backup properties and reinitialize PropertyService.
     			if (backupPath != null && !backupPath.equals("")) {
     				if (!backupPathExisted) {
     					setProperty("application.backupDir", backupPath);
     					String backupLocationFile =
     						SystemUtil.getUserHomeDir() + FileUtil.getFS() + "."
     						+ ServiceService.getRealApplicationContext() + FileUtil.getFS()
     						+ "backup-location";
     					FileUtil.writeFile(backupLocationFile, backupPath);
+    				}
     				setProperty("application.backupDir", backupPath);
     				SystemUtil.writeStoredBackupFile(backupPath);
     				// The mainBackupProperties hold properties that were backed up
     				// the last time the application was configured. On disk, the

+    	}
     	/**
     	 * Gets the stored backup location.  This location is held in a file at
     	 * <user_home>/.<application_context>/backup-location
+    	 *
     	 * @return a string holding the backup location.  Null if none could be found.
     	 */
     	public static String getStoredBackupDir() throws UtilException {
     		String applicationContext = null;
     		try {
     			applicationContext = ServiceService.getRealApplicationContext();
     			// Check if there is a file at
     			// <user_home>/<application_context>/backup-location. If so, it
     			// should contain one line that is a file that points to a writable
     			// directory. If that is true, use that value as the backup dir.
     			String storedBackupFileLoc = getUserHomeDir() + FileUtil.getFS() + "."
     					+ applicationContext + FileUtil.getFS() + "backup-location";
     			if (FileUtil.getFileStatus(storedBackupFileLoc) >= FileUtil.EXISTS_READABLE) {
     				String storedBackupDirLoc = FileUtil
     						.readFileToString(storedBackupFileLoc);
     				if (FileUtil.isDirectory(storedBackupDirLoc)
     						&& FileUtil.getFileStatus(storedBackupDirLoc) > FileUtil.EXISTS_READABLE) {
     					return storedBackupDirLoc;
+    				}
+    			}
     		} catch (IOException ioe) {
     			logMetacat.warn("I/O problem finding backup location: " + ioe.getMessage());
     		} catch (ServiceException se) {
     			logMetacat.warn("Could not get real application context: " + se.getMessage());
+    		}
     		return null;
+    	}
     	public static void writeStoredBackupFile(String backupPath) throws UtilException {
     		String applicationContext = null;
     		try {
     			applicationContext = ServiceService.getRealApplicationContext();
     			// Write the backup path to
     			// <user_home>/.<application_context>/backup-location.
     			String storedBackupFileDir = getUserHomeDir() + FileUtil.getFS() + "." + applicationContext;
     			String storedBackupFileLoc = storedBackupFileDir + FileUtil.getFS() + "backup-location";
     			if (!FileUtil.isDirectory(storedBackupFileDir)) {
     				FileUtil.createDirectory(storedBackupFileDir);
+    			}
     			if (FileUtil.getFileStatus(storedBackupFileLoc) == FileUtil.DOES_NOT_EXIST) {
     				FileUtil.createFile(storedBackupFileLoc);
+    			}
     			if (FileUtil.getFileStatus(storedBackupFileLoc) < FileUtil.EXISTS_READ_WRITABLE) {
     				throw new UtilException("Stored backup location file is not writable: " + storedBackupFileLoc);
+    			}
     			FileUtil.writeFile(storedBackupFileLoc, backupPath);
     		} catch (IOException ioe) {
     			logMetacat.warn("I/O proplem finding backup location: " + ioe.getMessage());
     		} catch (ServiceException se) {
     			logMetacat.warn("Could not get real application context: " + se.getMessage());
+    		}
+    	}
     	/**
     	 * Attempt to discover the external (to the metacat installation)
     	 * directory where metacat will hold backup files.   This functionality
     	 * is used to populate the configuration utility initially.  The user
-...
     	 * to give you the actual directory.  Here are the steps taken to discover
     	 * the directory:
+    	 *
     	 * -- 1) Look for a saved backup location file in the user home dir - Is there a file named
     	 *       <user_home>/metacat/.<application_context>/backup-location for the user that started
     	 *       tomcat? if so, does it contain a single line which is a readable directory?  This
     	 *       directory was the backup directory used during a previous install.  Return that directory.
     	 * -- 2) Otherwise, look for an existing hidden (.<application_context>) directory in a default system directory.  Get
          * -- 1) Look for an existing hidden (.<application_context>) directory in a default system directory.  Get
     	 *       the default base directory for the OS.  (See application.windowsBackupBaseDir and
     	 *       application.linuxBackupBaseDir in metacat.properties.)  If a directory called
     	 *       <base_dir>/metacat/.<application_context> exists, return <base_dir>/metacat.
     	 * -- 3) Otherwise, look for an existing hidden (.metacat) directory in the user directory. If a directory
     	 * -- 2) Otherwise, look for an existing hidden (.metacat) directory in the user directory. If a directory
     	 *       called <user_dir>/metacat/.<application_context> exists for the user that started tomcat,
     	 *       return <user_dir>/metacat.
     	 * -- 4) Otherwise, look for an existing metacat directory in a default system directory.  Get
     	 * -- 3) Otherwise, look for an existing metacat directory in a default system directory.  Get
     	 *       the default base directory for the OS.  (See application.windowsBackupBaseDir and
     	 *       application.linuxBackupBaseDir in metacat.properties.)  If a directory called
     	 *       <base_dir>/metacat exists, return <base_dir>/metacat.
     	 * -- 5) Otherwise, look for an existing metacat directory in the user directory. If a directory
     	 * -- 4) Otherwise, look for an existing metacat directory in the user directory. If a directory
     	 *       called <user_dir>/metacat/ exists for the user that started tomcat, return <user_dir>/metacat.
     	 * -- 6) Otherwise, is the <base_dir> writable by the user that started tomcat?  If so, return
     	 * -- 5) Otherwise, is the <base_dir> writable by the user that started tomcat?  If so, return
     	 *       <base_dir>/metacat
     	 * -- 7) Does the <user_home> exist?  If so, return <user_home>/metacat
     	 * -- 8) Otherwise, return null
     	 * -- 6) Does the <user_home> exist?  If so, return <user_home>/metacat
     	 * -- 7) Otherwise, return null
+    	 *
     	 * @return a string holding the backup directory path
     	 */
-...
     		try {
     			applicationContext = ServiceService.getRealApplicationContext();
     			// Check if there is a file at <user_home>/<application_context>/backup-location.  If so, it
     			// should contain one line that is a file that points to a writable directory.
     			// If that is true, use that value as the external dir.
     			String storedBackupFileLoc = getUserHomeDir() + FileUtil.getFS() + "." + applicationContext
     					+ FileUtil.getFS() + "backup-location";
     			if (FileUtil.getFileStatus(storedBackupFileLoc) >= FileUtil.EXISTS_READABLE) {
     				String storedBackupDirLoc = FileUtil.readFileToString(storedBackupFileLoc);
     				if (FileUtil.isDirectory(storedBackupDirLoc)
     						&& FileUtil.getFileStatus(storedBackupDirLoc) > FileUtil.EXISTS_READABLE) {
     					return storedBackupDirLoc;
+    				}
+    			}
     			// Set the default location using the os
     			String systemDir = "";

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 4805

Added by daigle almost 16 years ago