Project

General

Profile

« Previous | Next » 

Revision 5027

Added by daigle over 14 years ago

Change MetaCatVersion to MetacatVersion

View differences:

DBAdmin.java
50 50
import javax.servlet.http.HttpServletResponse;
51 51
import javax.servlet.http.HttpSession;
52 52

  
53
import edu.ucsb.nceas.metacat.MetaCatVersion;
53
import edu.ucsb.nceas.metacat.MetacatVersion;
54 54
import edu.ucsb.nceas.metacat.database.DBConnection;
55 55
import edu.ucsb.nceas.metacat.database.DBConnectionPool;
56 56
import edu.ucsb.nceas.metacat.database.DBVersion;
......
71 71
 * Control the display of the database configuration page and the processing
72 72
 * of the configuration values.
73 73
 */
74
public class DBAdmin extends MetaCatAdmin {
74
public class DBAdmin extends MetacatAdmin {
75 75
	// db statuses used by discovery code
76 76
	public static final int DB_DOES_NOT_EXIST = 0;
77 77
	public static final int TABLES_DO_NOT_EXIST = 1;
......
156 156
				// the appropriate scripts to get them synchronized.
157 157

  
158 158
				databaseVersion = discoverDBVersion();
159
				MetaCatVersion metacatVersion = SystemUtil.getMetacatVersion();
159
				MetacatVersion metacatVersion = SystemUtil.getMetacatVersion();
160 160
				
161
				session.setAttribute("metacatVersion", MetaCatVersion.getVersionID());
161
				session.setAttribute("metacatVersion", MetacatVersion.getVersionID());
162 162

  
163 163
				// if the db version is already the same as the metacat
164 164
				// version, update metacat.properties
......
167 167
							PropertyService.CONFIGURED);
168 168
				}
169 169
				
170
				MetaCatVersion metaCatVersion = SystemUtil.getMetacatVersion();
170
				MetacatVersion metaCatVersion = SystemUtil.getMetacatVersion();
171 171
				request.setAttribute("metacatVersion", metaCatVersion);
172 172
				DBVersion dbVersionString = getDBVersion();
173 173
				request.setAttribute("databaseVersion", dbVersionString);
......
179 179
				// Forward the request to the JSP page
180 180
				RequestUtil.clearRequestMessages(request);
181 181
				RequestUtil.forwardRequest(request, response,
182
						"/admin/database-configuration.jsp");
182
						"/admin/database-configuration.jsp", null);
183 183
			} catch (GeneralPropertyException gpe) {
184 184
				throw new AdminException("Problem getting or setting property while " 
185 185
						+ "initializing system properties page: " + gpe.getMessage());
......
221 221
				RequestUtil.clearRequestMessages(request);
222 222
				RequestUtil.setRequestSuccess(request, processingSuccess);
223 223
				RequestUtil.forwardRequest(request, response,
224
						"/admin?configureType=configure&processForm=false");
224
						"/admin?configureType=configure&processForm=false", null);
225 225
				// Write out the configurable properties to a backup file
226 226
				// outside the install directory.
227 227

  
......
476 476

  
477 477
			pstmt = conn.prepareStatement("INSERT INTO db_version "
478 478
					+ "(version, status, date_created) VALUES (?,?,?)");
479
			pstmt.setString(1, MetaCatVersion.getVersionID());
479
			pstmt.setString(1, MetacatVersion.getVersionID());
480 480
			pstmt.setInt(2, VERSION_ACTIVE);
481 481
			pstmt.setTimestamp(3, new Timestamp(new Date().getTime()));
482 482
			pstmt.execute();
......
691 691
		Vector<String> updateScriptList = new Vector<String>();
692 692
		String sqlFileLocation = null;
693 693
		String databaseType = null;
694
		MetaCatVersion metaCatVersion = null; 
694
		MetacatVersion metaCatVersion = null; 
695 695
		
696 696
		// get the location of sql scripts
697 697
		try {

Also available in: Unified diff