Project

General

Profile

« Previous | Next » 

Revision 4198

Added by daigle over 16 years ago

Add geoserver section. Remove organization section for now. Allow user to go directly to metacat after first configuration.

View differences:

lib/admin/metacat-configuration.jsp
1
<%@ page language="java" import="edu.ucsb.nceas.metacat.DBVersion,edu.ucsb.nceas.metacat.MetaCatVersion" %>
1
<%@ page language="java"  %>
2
<%@ page import="edu.ucsb.nceas.metacat.DBVersion,edu.ucsb.nceas.metacat.MetaCatVersion" %>
3
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
2 4

  
3 5
<%
4 6
	/**
......
35 37
    Boolean ldapConfigured = (Boolean)request.getAttribute("ldapConfigured");	
36 38
    Boolean skinsConfigured = (Boolean)request.getAttribute("skinsConfigured");	
37 39
    Boolean dbConfigured = (Boolean)request.getAttribute("dbConfigured");
40
    String geoserverConfigured = (String)request.getAttribute("geoserverConfigured");
38 41
    Boolean metacatConfigured = (Boolean)request.getAttribute("metacatConfigured");
42
    Boolean metacatServletInitialized = (Boolean)request.getAttribute("metcatServletInitialized");
39 43
%>
40 44

  
41 45
<html>
......
56 60
<hr class="config-line">
57 61

  
58 62
<table class="configuration-table">
63

  
59 64
<%
60
	if (ldapConfigured != null && ldapConfigured) {
65
	if (propsConfigured != null && propsConfigured) {
61 66
%>
62 67
        <tr>
63 68
        <td class="configured-tag">[configured] </td>
64
		<td class="property-title"> LDAP Configuration </td> 
65
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Reconfigure Now</a> </td>
69
		<td class="property-title"> Metacat Global Properties </td> 
70
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
66 71
        </tr>
67 72
<%
68 73
	} else {
69 74
%>    		
70 75
        <tr>
71
 		<td class=unconfigured-tag>[unconfigured] </td>  
72
 		<td class=property-title> LDAP Configuration </td>
73
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Configure Now</a> </td>			
76
 		<td class="unconfigured-tag">[unconfigured] </td>  
77
 		<td class="property-title"> Metacat Global Properties </td>
78
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>			
74 79
    	</tr>
75 80
<%
76 81
	}
77
%>
78 82

  
79
<%
80
	if (orgsConfigured != null && orgsConfigured) {
83
	if (ldapConfigured != null && ldapConfigured) {
81 84
%>
82 85
        <tr>
83 86
        <td class="configured-tag">[configured] </td>
84
		<td class="property-title"> Organization Configuration </td> 
85
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=organization">Reconfigure Now</a> </td>
87
		<td class="property-title"> LDAP Configuration </td> 
88
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Reconfigure Now</a> </td>
86 89
        </tr>
87 90
<%
88 91
	} else {
89 92
%>    		
90 93
        <tr>
91 94
 		<td class=unconfigured-tag>[unconfigured] </td>  
92
 		<td class=property-title> Organization Configuration </td>
93
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=organization">Configure Now</a> </td>			
95
 		<td class=property-title> LDAP Configuration </td>
96
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Configure Now</a> </td>			
94 97
    	</tr>
95 98
<%
96 99
	}
97
%>
98

  
99
<%
100
	if (propsConfigured != null && propsConfigured) {
101
%>
102
        <tr>
103
        <td class="configured-tag">[configured] </td>
104
		<td class="property-title"> Metacat Global Properties </td> 
105
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
106
        </tr>
107
<%
108
	} else {
109
%>    		
110
        <tr>
111
 		<td class="unconfigured-tag">[unconfigured] </td>  
112
 		<td class="property-title"> Metacat Global Properties </td>
113
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>			
114
    	</tr>
115
<%
116
	}
117

  
100
	
118 101
    if (skinsConfigured != null && skinsConfigured) {
119 102
%>
120 103
        <tr>
......
131 114
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>			
132 115
    	</tr>
133 116
<%
134
	}
117
	}  
135 118
    
136 119
    if ((dbConfigured != null && dbConfigured) ||
137 120
    		(metacatVersion != null && databaseVersion != null && 
......
149 132
    	<td class="unconfigured-tag">[unconfigured] </td>  
150 133
    	<td class="property-title"> Database Installation/Upgrade </td>
151 134
<%
152
	if (propsConfigured != null && propsConfigured) {
135
		if (propsConfigured != null && propsConfigured) {
153 136
%>
154 137
        	
155 138
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>			
156 139
        	
157 140
<%
158
	} else {
141
		} else {
159 142
%> 
160
		<td class="configure-link"> Configure System Properties First </td>
143
		<td class="configure-link"> Configure Global Properties First </td>
161 144
<%
162
				}
145
		}
163 146
			%>     	
164 147
    	</tr>
165 148
<%
166 149
	}
150

  
151
    if (geoserverConfigured != null && geoserverConfigured.equals(PropertyService.CONFIGURED)) {
167 152
%>
153
    	<tr>
154
    	<td class="configured-tag">[configured] </td>
155
    	<td class="property-title"> Geoserver Configuration </td> 
156
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>   		
157
    	</tr>
158
<%
159
	} else if (geoserverConfigured != null && geoserverConfigured.equals(PropertyService.BYPASSED)){
160
%>    		
161
    	<tr>
162
    	<td class="configured-tag">[bypassed] </td>  
163
		<td class="property-title"> Geoserver Configuration </td>  
164
<%
165
		if (propsConfigured != null && propsConfigured) {
166
%>
167
        	
168
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Configure Now</a> </td>			       	
169
<%
170
		} else {
171
%> 
172
		<td class="configure-link"> Configure Global Properties First </td>
173
<%
174
		}
175
			%>     	
176
    	</tr>
177
<%
178
	} else {
179
%>    		
180
    	<tr>
181
    	<td class="unconfigured-tag">[unconfigured] </td>  
182
    	<td class="property-title"> Geoserver Configuration </td>   
183
<%
184
		if (propsConfigured != null && propsConfigured) {
185
%>
186
        	
187
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Configure Now</a> </td>			
188
        	
189
<%
190
		} else {
191
%> 
192
		<td class="configure-link"> Configure Global Properties First </td>
193
<%
194
		}
195
%>     	
196
    	</tr>
197
<%
198
	}
199
%>
200

  
168 201
</table>
169
<hr class="config-line">
170 202

  
171 203
<%
172 204
	if (metacatConfigured != null && metacatConfigured) {
173 205
%>
174
	<br>
175
	<h3>Configuring Geoserver</h3>
176
	<p>Metacat ships with <a href="http://docs.codehaus.org/display/GEOS/Home">Geoserver</a> to handle the spatial functionality.
177
	   Regardless of whether you plan on using the spatial functionality you should,
178
	   for security purposes, configure geoserver initially so that it doesn't use
179
	   the default password.
180
	   To configure geoserver with a new admin password:
181
	   <ol>
182
	    <li> Point your browser to 
183
	     <a href="<%= request.getScheme() + "://" +
184
	       request.getServerName() + ":" + request.getServerPort() +
185
              request.getContextPath() %>/geoserver.jsp"><%= request.getScheme() + "://" +
186
	                      request.getServerName() + ":" + request.getServerPort() +
187
			                      request.getContextPath() %>/geoserver.jsp</a>. </li>
188
	     <li> Login using the default username and password ( <em>admin</em> / <em>geoserver</em> ) </li>
189
	    <li> Point your browser to 
190
	     <a href="<%= request.getScheme() + "://" +
191
	       request.getServerName() + ":" + request.getServerPort() +
192
              request.getContextPath() %>/config/loginEdit.do"><%= request.getScheme() + "://" +
193
	                      request.getServerName() + ":" + request.getServerPort() +
194
			                      request.getContextPath() %>/config/loginEdit.do</a>, enter a new user and password then submit. </li>
195
	     <li> In the upper-left, click <em>Apply</em> then <em>Save</em> to save your new password.
196

  
197

  
198
	    </ol>
199
	</p>
200 206
	
201 207
	<hr class="config-line">
202 208
	<br clear="right"/>
209
<%
210
		if (metacatServletInitialized != null && metacatServletInitialized) {
211
%>	
203 212
	<h3>Restarting Metacat</h3>
213
	<p> Since this is a reconfiguration, you will need to restart Metacat after any changes.</p>
214
	
204 215
	<p>The simplest way to restart metacat is to restart the entire servlet engine.
205 216
	   For Tomcat, this would mean calling "$TOMCAT_HOME/bin/tomcat.sh restart" or
206 217
	   an equivalent command appropriate to your operating system. After restarting,
......
211 222
                request.getServerName() + ":" + request.getServerPort() +
212 223
                request.getContextPath() %></a>
213 224
	</p>
225
<%
226
		} else {
227
%> 	
228
			Configuration of Metacat is complete.  You can <a href="<%= request.getContextPath() %>/metacat?action=gohome">go to metacat</a> 
229
			now.  Note that this may take some time while the system initializes with the new configuration values.
230
<%
231
		}
232
%>			
214 233

  
215 234
	<hr class="config-line">
216 235
	<%@ include file="./login-footer-section.jsp"%>

Also available in: Unified diff