Project

General

Profile

Revision 5031

Added by daigle almost 11 years ago

Change location of PropertyService to properties directory

View differences:

lib/admin/backup-configuration.jsp
1 1
<%@ page language="java"%>
2 2
<%@ page
3
	import="edu.ucsb.nceas.metacat.util.OrganizationUtil,edu.ucsb.nceas.metacat.service.PropertyService"%>
3
	import="edu.ucsb.nceas.metacat.util.OrganizationUtil,edu.ucsb.nceas.metacat.properties.PropertyService"%>
4 4
<%
5 5
	/**
6 6
	 *  '$RCSfile$'
lib/admin/admin-login.jsp
1 1
<%@ page language="java" %> 
2
<%@ page import="edu.ucsb.nceas.metacat.util.OrganizationUtil,edu.ucsb.nceas.metacat.service.PropertyService" %>
2
<%@ page import="edu.ucsb.nceas.metacat.util.OrganizationUtil,edu.ucsb.nceas.metacat.properties.PropertyService" %>
3 3
<% 
4 4
/**
5 5
 *  '$RCSfile$'
lib/admin/metacat-configuration.jsp
1 1
<%@ page language="java"  %>
2 2
<%@ page import="edu.ucsb.nceas.metacat.database.DBVersion,edu.ucsb.nceas.metacat.MetacatVersion" %>
3
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
3
<%@ page import="edu.ucsb.nceas.metacat.properties.PropertyService" %>
4 4

  
5 5
<%
6 6
	/**
......
125 125
    	<tr>
126 126
    	<td class="configured-tag">[configured] </td>
127 127
    	<td class="property-title"> Database Installation/Upgrade </td> 
128
		<td class="configure-link"> Version: <%= databaseVersion.getVersionString() %> </td>    		
128
		<td class="configure-link"> Version: <%=databaseVersion.getVersionString()%> </td>    		
129 129
    	</tr>
130 130
<%
131 131
	} else {
......
134 134
    	<td class="unconfigured-tag">[unconfigured] </td>  
135 135
    	<td class="property-title"> Database Installation/Upgrade </td>
136 136
<%
137
		if (propsConfigured != null && propsConfigured) {
137
	if (propsConfigured != null && propsConfigured) {
138 138
%>
139 139
        	
140 140
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>			
141 141
        	
142 142
<%
143
		} else {
144
%> 
143
			        		} else {
144
			        	%> 
145 145
		<td class="configure-link"> Configure Global Properties First </td>
146 146
<%
147
		}
148
			%>     	
147
	}
148
%>     	
149 149
    	</tr>
150 150
<%
151 151
	}
lib/style/skins/default/index.jsp
1
<%@ page    language="java" import="edu.ucsb.nceas.metacat.service.PropertyService"%>
1
<%@ page    language="java" import="edu.ucsb.nceas.metacat.properties.PropertyService"%>
2 2
<% 
3 3
 /**
4 4
  *  '$RCSfile$'
lib/style/skins/first/index.jsp
1 1
<%@ page    language="java" %>
2 2
<%
3
/**
3
	/**
4 4
 * 
5 5
 * '$RCSfile$'
6 6
 * Copyright: 2008 Regents of the University of California and the
......
22 22
 * You should have received a copy of the GNU General Public License
23 23
 * along with this program; if not, write to the Free Software
24 24
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
25
 */  
25
 */
26 26
%>
27 27

  
28 28
<%@ include file="../../common/common-settings.jsp"%>
lib/style/skins/knb2/index2.jsp
32 32
%>
33 33
<%@ include file="PORTAL_SETTINGS.jsp"%>
34 34
<%@ include file="include_session_vars.jsp"%>
35
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
35
<%@ page import="edu.ucsb.nceas.metacat.properties.PropertyService" %>
36 36

  
37 37
<% 
38 38
	Vector<String> organizationList = OrganizationUtil.getOrganizations();
lib/style/skins/knb2/index_map_only.jsp
32 32
%>
33 33
<%@ include file="PORTAL_SETTINGS.jsp"%>
34 34
<%@ include file="include_session_vars.jsp"%>
35
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
35
<%@ page import="edu.ucsb.nceas.metacat.properties.PropertyService" %>
36 36

  
37 37
<%
38 38
///////////////////////////////////////////////////////////////////////////////
lib/style/skins/knb2/index.jsp
32 32
%>
33 33
<%@ include file="PORTAL_SETTINGS.jsp"%>
34 34
<%@ include file="include_session_vars.jsp"%>
35
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
35
<%@ page import="edu.ucsb.nceas.metacat.properties.PropertyService" %>
36 36

  
37 37
<% 
38 38
	Vector<String> organizationList = OrganizationUtil.getOrganizations();
lib/style/common/ClientViewHelper.jspx
3 3
    
4 4
    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
5 5
    <jsp:directive.page import="com.oreilly.servlet.multipart.MultipartParser"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.service.PropertyService"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.properties.PropertyService"/>
7 7
    <jsp:directive.page import="java.io.*"/>
8 8
    <jsp:directive.page import="javax.servlet.*"/>
9 9
    <jsp:directive.page import="javax.servlet.http.*"/>
lib/style/common/fgdc/ClientViewHelper.jspx
3 3
    
4 4
    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
5 5
    <jsp:directive.page import="com.oreilly.servlet.multipart.MultipartParser"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.service.PropertyService"/>
6
    <jsp:directive.page import="edu.ucsb.nceas.metacat.properties.PropertyService"/>
7 7
    <jsp:directive.page import="java.io.*"/>
8 8
    <jsp:directive.page import="javax.servlet.*"/>
9 9
    <jsp:directive.page import="javax.servlet.http.*"/>
src/upgrade_db_to_1_5.java
33 33
import java.sql.SQLException;
34 34
import java.sql.DriverManager;
35 35

  
36
import edu.ucsb.nceas.metacat.service.PropertyService;
36
import edu.ucsb.nceas.metacat.properties.PropertyService;
37 37
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
38 38

  
39 39
public class upgrade_db_to_1_5{

Also available in: Unified diff