Revision 4159
Added by daigle over 15 years ago
MetaCatAdminServlet.java | ||
---|---|---|
42 | 42 |
import edu.ucsb.nceas.metacat.service.SessionService; |
43 | 43 |
import edu.ucsb.nceas.metacat.util.LDAPUtil; |
44 | 44 |
import edu.ucsb.nceas.metacat.util.MetaCatUtil; |
45 |
import edu.ucsb.nceas.metacat.util.OrganizationUtil; |
|
45 | 46 |
import edu.ucsb.nceas.metacat.util.RequestUtil; |
46 | 47 |
import edu.ucsb.nceas.metacat.util.SkinUtil; |
47 | 48 |
import edu.ucsb.nceas.metacat.util.SystemUtil; |
... | ... | |
133 | 134 |
DBAdmin.getInstance().getDBVersion()); |
134 | 135 |
} |
135 | 136 |
request.setAttribute("ldapConfigured", new Boolean(LDAPUtil.isLDAPConfigured())); |
137 |
request.setAttribute("orgsConfigured", new Boolean(OrganizationUtil.areOrganizationsConfigured())); |
|
136 | 138 |
request.setAttribute("skinsConfigured", new Boolean(SkinUtil.areSkinsConfigured())); |
137 | 139 |
request.setAttribute("metacatConfigured", new Boolean(MetaCatUtil.isMetacatConfigured())); |
138 | 140 |
RequestUtil.forwardRequest(request, response, |
... | ... | |
148 | 150 |
SkinsAdmin.getInstance().configureSkins(request, response); |
149 | 151 |
return; |
150 | 152 |
} else if (action.equals("database")) { |
151 |
// process properties
|
|
153 |
// process database
|
|
152 | 154 |
DBAdmin.getInstance().configureDatabase(request, response); |
153 | 155 |
return; |
154 | 156 |
} else if (action.equals("ldap")) { |
155 |
// process properties
|
|
157 |
// process ldap
|
|
156 | 158 |
LDAPAdmin.getInstance().configureLDAP(request, response); |
157 | 159 |
return; |
160 |
} else if (action.equals("organization")) { |
|
161 |
// process organization |
|
162 |
OrganizationAdmin.getInstance().configureOrganization(request, response); |
|
163 |
return; |
|
158 | 164 |
} else if (action.equals("login")) { |
159 |
// process properties
|
|
165 |
// process login
|
|
160 | 166 |
AuthAdmin.getInstance().authenticateUser(request, response); |
161 | 167 |
return; |
162 | 168 |
} else { |
Also available in: Unified diff
Add support for separate LDAP and organization level configurations