Revision 6984
Added by Matt Jones about 13 years ago
src/edu/ucsb/nceas/metacat/admin/D1Admin.java | ||
---|---|---|
3 | 3 |
* Purpose: A Class that implements database configuration methods |
4 | 4 |
* Copyright: 2008 Regents of the University of California and the |
5 | 5 |
* National Center for Ecological Analysis and Synthesis |
6 |
* Authors: Michael Daigle |
|
7 | 6 |
* |
8 | 7 |
* '$Author$' |
9 | 8 |
* '$Date$' |
... | ... | |
109 | 108 |
String memberNodeId = PropertyService.getProperty("dataone.memberNodeId"); |
110 | 109 |
String nodeSynchronize = PropertyService.getProperty("dataone.nodeSynchronize"); |
111 | 110 |
String nodeReplicate = PropertyService.getProperty("dataone.nodeReplicate"); |
112 |
String subject = PropertyService.getProperty("dataone.subject");
|
|
111 |
String subject = PropertyService.getProperty("dataone.subject");
|
|
113 | 112 |
String contactSubject = PropertyService.getProperty("dataone.contactSubject"); |
114 | 113 |
String certpath = PropertyService.getProperty("D1Client.certificate.file"); |
115 | 114 |
|
... | ... | |
146 | 145 |
request.setAttribute("dataone.memberNodeId", memberNodeId); |
147 | 146 |
request.setAttribute("dataone.nodeSynchronize", Boolean.toString(synchronize)); |
148 | 147 |
request.setAttribute("dataone.nodeReplicate", Boolean.toString(replicate)); |
149 |
request.setAttribute("dataone.subject", subject);
|
|
148 |
request.setAttribute("dataone.subject", subject);
|
|
150 | 149 |
request.setAttribute("dataone.contactSubject", contactSubject); |
151 | 150 |
request.setAttribute("D1Client.certificate.file", certpath); |
152 | 151 |
|
... | ... | |
237 | 236 |
String memberNodeId = (String)request.getParameter("dataone.memberNodeId"); |
238 | 237 |
String nodeSynchronize = (String)request.getParameter("dataone.nodeSynchronize"); |
239 | 238 |
String nodeReplicate = (String)request.getParameter("dataone.nodeReplicate"); |
240 |
String subject = (String)request.getParameter("dataone.subject");
|
|
239 |
String subject = (String)request.getParameter("dataone.subject");
|
|
241 | 240 |
String contactSubject = (String)request.getParameter("dataone.contactSubject"); |
242 | 241 |
String certpath = (String)request.getParameter("D1Client.certificate.file"); |
243 | 242 |
|
... | ... | |
268 | 267 |
PropertyService.setPropertyNoPersist("dataone.nodeDescription", nodeDescription); |
269 | 268 |
|
270 | 269 |
// check if we have updated the memberNodeId |
271 |
String existingMemberNodeId = PropertyService.getProperty("dataone.memberNodeId"); |
|
272 |
if (!existingMemberNodeId.equals(memberNodeId)) { |
|
273 |
// update all existing system Metadata for this node id |
|
274 |
IdentifierManager.getInstance().updateAuthoritativeMemberNodeId(existingMemberNodeId, memberNodeId); |
|
275 |
} |
|
276 |
// TODO: persist in DB? |
|
277 |
PropertyService.setPropertyNoPersist("dataone.memberNodeId", memberNodeId); |
|
270 |
// String existingMemberNodeId = PropertyService.getProperty("dataone.memberNodeId");
|
|
271 |
// if (!existingMemberNodeId.equals(memberNodeId)) {
|
|
272 |
// // update all existing system Metadata for this node id
|
|
273 |
// IdentifierManager.getInstance().updateAuthoritativeMemberNodeId(existingMemberNodeId, memberNodeId);
|
|
274 |
// }
|
|
275 |
// // TODO: persist in DB?
|
|
276 |
// PropertyService.setPropertyNoPersist("dataone.memberNodeId", memberNodeId);
|
|
278 | 277 |
|
279 | 278 |
PropertyService.setPropertyNoPersist("dataone.nodeSynchronize", Boolean.toString(synchronize)); |
280 | 279 |
PropertyService.setPropertyNoPersist("dataone.nodeReplicate", Boolean.toString(replicate)); |
281 |
PropertyService.setPropertyNoPersist("dataone.subject", subject);
|
|
282 |
PropertyService.setPropertyNoPersist("dataone.contactSubject", subject); // same as subject for now
|
|
280 |
PropertyService.setPropertyNoPersist("dataone.subject", subject);
|
|
281 |
PropertyService.setPropertyNoPersist("dataone.contactSubject", contactSubject);
|
|
283 | 282 |
PropertyService.setPropertyNoPersist("D1Client.certificate.file", certpath); |
284 | 283 |
|
285 | 284 |
// the synch schedule |
... | ... | |
297 | 296 |
registerDataONEMemberNode(); |
298 | 297 |
|
299 | 298 |
// Generate ORE, if we haven't |
300 |
boolean oreGenerated = Boolean.parseBoolean(PropertyService.getProperty("configutil.dataone.ore.generated"));
|
|
299 |
boolean oreGenerated = Boolean.parseBoolean(PropertyService.getProperty("dataone.ore.generated")); |
|
301 | 300 |
if (!oreGenerated) { |
302 | 301 |
GenerateORE gore = new GenerateORE(); |
303 | 302 |
gore.upgrade(); |
Also available in: Unified diff
Remove ability to edit NodeID from D1 configuration page. Fix update of contactSubject and dataone.ore.generated property name.