Revision 4200
Added by daigle over 16 years ago
src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java | ||
---|---|---|
38 | 38 |
|
39 | 39 |
import org.apache.log4j.Logger; |
40 | 40 |
|
41 |
import edu.ucsb.nceas.metacat.MetaCatServlet; |
|
41 | 42 |
import edu.ucsb.nceas.metacat.service.PropertyService; |
42 | 43 |
import edu.ucsb.nceas.metacat.service.SessionService; |
43 | 44 |
import edu.ucsb.nceas.metacat.util.LDAPUtil; |
44 | 45 |
import edu.ucsb.nceas.metacat.util.MetaCatUtil; |
45 |
import edu.ucsb.nceas.metacat.util.OrganizationUtil; |
|
46 |
//import edu.ucsb.nceas.metacat.util.OrganizationUtil;
|
|
46 | 47 |
import edu.ucsb.nceas.metacat.util.RequestUtil; |
47 | 48 |
import edu.ucsb.nceas.metacat.util.SkinUtil; |
48 | 49 |
import edu.ucsb.nceas.metacat.util.SystemUtil; |
... | ... | |
133 | 134 |
request.setAttribute("databaseVersion", |
134 | 135 |
DBAdmin.getInstance().getDBVersion()); |
135 | 136 |
} |
136 |
request.setAttribute("ldapConfigured", new Boolean(LDAPUtil.isLDAPConfigured())); |
|
137 |
request.setAttribute("orgsConfigured", new Boolean(OrganizationUtil.areOrganizationsConfigured())); |
|
137 |
request.setAttribute("ldapConfigured", new Boolean(LDAPUtil.isLDAPConfigured())); |
|
138 |
// TODO MCD figure out if we still need an org section |
|
139 |
//request.setAttribute("orgsConfigured", new Boolean(OrganizationUtil.areOrganizationsConfigured())); |
|
138 | 140 |
request.setAttribute("skinsConfigured", new Boolean(SkinUtil.areSkinsConfigured())); |
139 | 141 |
request.setAttribute("metacatConfigured", new Boolean(MetaCatUtil.isMetacatConfigured())); |
142 |
request.setAttribute("geoserverConfigured", |
|
143 |
PropertyService.getProperty("configutil.geoserverConfigured")); |
|
144 |
request.setAttribute("metcatServletInitialized", MetaCatServlet.isFullyInitialized()); |
|
140 | 145 |
RequestUtil.forwardRequest(request, response, |
141 | 146 |
"/admin/metacat-configuration.jsp?configureType=configure"); |
142 | 147 |
return; |
... | ... | |
157 | 162 |
// process ldap |
158 | 163 |
LDAPAdmin.getInstance().configureLDAP(request, response); |
159 | 164 |
return; |
160 |
} else if (action.equals("organization")) { |
|
161 |
// process organization |
|
162 |
OrganizationAdmin.getInstance().configureOrganization(request, response); |
|
163 |
return; |
|
165 |
// TODO MCD figure out if org configuration is still needed |
|
166 |
// } else if (action.equals("organization")) { |
|
167 |
// // process organization |
|
168 |
// OrganizationAdmin.getInstance().configureOrganization(request, response); |
|
169 |
// return; |
|
164 | 170 |
} else if (action.equals("login")) { |
165 | 171 |
// process login |
166 | 172 |
AuthAdmin.getInstance().authenticateUser(request, response); |
167 | 173 |
return; |
174 |
} else if (action.equals("geoserver")) { |
|
175 |
// process geoserver password change |
|
176 |
GeoserverAdmin.getInstance().configureGeoserver(request, response); |
|
177 |
return; |
|
168 | 178 |
} else { |
169 | 179 |
String errorMessage = "Invalid action in configuration request: " + action; |
170 | 180 |
logMetacat.error(errorMessage); |
171 | 181 |
processingErrors.add(errorMessage); |
172 |
} |
|
182 |
}
|
|
173 | 183 |
} catch (PropertyNotFoundException pnfe) { |
174 | 184 |
String errorMessage = |
175 | 185 |
"Property problem while handling request: " + pnfe.getMessage(); |
Also available in: Unified diff
Remove the organization configuration stuff for the moment. Add geoserver configuration.