Revision 6987
Added by Matt Jones about 12 years ago
| D1Admin.java | ||
|---|---|---|
| 107 | 107 |
String nodeDescription = PropertyService.getProperty("dataone.nodeDescription");
|
| 108 | 108 |
String memberNodeId = PropertyService.getProperty("dataone.memberNodeId");
|
| 109 | 109 |
String nodeSynchronize = PropertyService.getProperty("dataone.nodeSynchronize");
|
| 110 |
String nodeReplicate = PropertyService.getProperty("dataone.nodeReplicate");
|
|
| 111 | 110 |
String subject = PropertyService.getProperty("dataone.subject");
|
| 112 | 111 |
String contactSubject = PropertyService.getProperty("dataone.contactSubject");
|
| 113 | 112 |
String certpath = PropertyService.getProperty("D1Client.certificate.file");
|
| ... | ... | |
| 121 | 120 |
String min = PropertyService.getProperty("dataone.nodeSynchronization.schedule.min");
|
| 122 | 121 |
String sec = PropertyService.getProperty("dataone.nodeSynchronization.schedule.sec");
|
| 123 | 122 |
|
| 123 |
// the replication policies |
|
| 124 |
String nodeReplicate = PropertyService.getProperty("dataone.nodeReplicate");
|
|
| 125 |
String numReplicas = PropertyService.getProperty("dataone.replicationpolicy.default.numreplicas");
|
|
| 126 |
String preferredNodeList = PropertyService.getProperty("dataone.replicationpolicy.default.preferredNodeList");
|
|
| 127 |
String blockedNodeList = PropertyService.getProperty("dataone.replicationpolicy.default.blockedNodeList");
|
|
| 128 |
|
|
| 124 | 129 |
/** |
| 125 | 130 |
dataone.nodeSynchronization.schedule.year=* |
| 126 | 131 |
dataone.nodeSynchronization.schedule.mon=* |
| ... | ... | |
| 144 | 149 |
request.setAttribute("dataone.nodeDescription", nodeDescription);
|
| 145 | 150 |
request.setAttribute("dataone.memberNodeId", memberNodeId);
|
| 146 | 151 |
request.setAttribute("dataone.nodeSynchronize", Boolean.toString(synchronize));
|
| 147 |
request.setAttribute("dataone.nodeReplicate", Boolean.toString(replicate));
|
|
| 148 | 152 |
request.setAttribute("dataone.subject", subject);
|
| 149 | 153 |
request.setAttribute("dataone.contactSubject", contactSubject);
|
| 150 | 154 |
request.setAttribute("D1Client.certificate.file", certpath);
|
| ... | ... | |
| 158 | 162 |
request.setAttribute("dataone.nodeSynchronization.schedule.min", min);
|
| 159 | 163 |
request.setAttribute("dataone.nodeSynchronization.schedule.sec", sec);
|
| 160 | 164 |
|
| 165 |
// replication policies |
|
| 166 |
request.setAttribute("dataone.nodeReplicate", Boolean.toString(replicate));
|
|
| 167 |
request.setAttribute("dataone.replicationpolicy.default.numreplicas", numReplicas);
|
|
| 168 |
request.setAttribute("dataone.replicationpolicy.default.preferredNodeList", preferredNodeList);
|
|
| 169 |
request.setAttribute("dataone.replicationpolicy.default.blockedNodeList", blockedNodeList);
|
|
| 170 |
|
|
| 171 |
|
|
| 161 | 172 |
// try the backup properties |
| 162 | 173 |
SortedProperties backupProperties = null; |
| 163 | 174 |
if ((backupProperties = |
| ... | ... | |
| 235 | 246 |
String nodeDescription = (String)request.getParameter("dataone.nodeDescription");
|
| 236 | 247 |
String memberNodeId = (String)request.getParameter("dataone.memberNodeId");
|
| 237 | 248 |
String nodeSynchronize = (String)request.getParameter("dataone.nodeSynchronize");
|
| 238 |
String nodeReplicate = (String)request.getParameter("dataone.nodeReplicate");
|
|
| 239 | 249 |
String subject = (String)request.getParameter("dataone.subject");
|
| 240 | 250 |
String contactSubject = (String)request.getParameter("dataone.contactSubject");
|
| 241 | 251 |
String certpath = (String)request.getParameter("D1Client.certificate.file");
|
| ... | ... | |
| 249 | 259 |
String min = (String) request.getParameter("dataone.nodeSynchronization.schedule.min");
|
| 250 | 260 |
String sec = (String) request.getParameter("dataone.nodeSynchronization.schedule.sec");
|
| 251 | 261 |
|
| 262 |
// the replication policies |
|
| 263 |
String nodeReplicate = (String)request.getParameter("dataone.nodeReplicate");
|
|
| 264 |
String numReplicas = (String)request.getParameter("dataone.replicationpolicy.default.numreplicas");
|
|
| 265 |
String preferredNodeList = (String)request.getParameter("dataone.replicationpolicy.default.preferredNodeList");
|
|
| 266 |
String blockedNodeList = (String)request.getParameter("dataone.replicationpolicy.default.blockedNodeList");
|
|
| 267 |
|
|
| 252 | 268 |
boolean synchronize = false; |
| 253 | 269 |
if (nodeSynchronize != null) {
|
| 254 | 270 |
synchronize = Boolean.parseBoolean(nodeSynchronize); |
| ... | ... | |
| 264 | 280 |
} else {
|
| 265 | 281 |
|
| 266 | 282 |
PropertyService.setPropertyNoPersist("dataone.nodeName", nodeName);
|
| 267 |
PropertyService.setPropertyNoPersist("dataone.nodeDescription", nodeDescription);
|
|
| 268 |
|
|
| 269 |
// check if we have updated the 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);
|
|
| 277 |
|
|
| 283 |
PropertyService.setPropertyNoPersist("dataone.nodeDescription", nodeDescription);
|
|
| 278 | 284 |
PropertyService.setPropertyNoPersist("dataone.nodeSynchronize", Boolean.toString(synchronize));
|
| 279 |
PropertyService.setPropertyNoPersist("dataone.nodeReplicate", Boolean.toString(replicate));
|
|
| 280 | 285 |
PropertyService.setPropertyNoPersist("dataone.subject", subject);
|
| 281 | 286 |
PropertyService.setPropertyNoPersist("dataone.contactSubject", contactSubject);
|
| 282 | 287 |
PropertyService.setPropertyNoPersist("D1Client.certificate.file", certpath);
|
| ... | ... | |
| 290 | 295 |
PropertyService.setPropertyNoPersist("dataone.nodeSynchronization.schedule.min", min);
|
| 291 | 296 |
PropertyService.setPropertyNoPersist("dataone.nodeSynchronization.schedule.sec", sec);
|
| 292 | 297 |
|
| 298 |
// the replication policies |
|
| 299 |
PropertyService.setPropertyNoPersist("dataone.nodeReplicate", Boolean.toString(replicate));
|
|
| 300 |
PropertyService.setPropertyNoPersist("dataone.replicationpolicy.default.numreplicas", numReplicas);
|
|
| 301 |
PropertyService.setPropertyNoPersist("dataone.replicationpolicy.default.preferredNodeList", preferredNodeList);
|
|
| 302 |
PropertyService.setPropertyNoPersist("dataone.replicationpolicy.default.blockedNodeList", blockedNodeList);
|
|
| 303 |
|
|
| 304 |
|
|
| 293 | 305 |
PropertyService.persistProperties(); |
| 294 | 306 |
|
| 295 | 307 |
// Register/update as a DataONE Member Node |
Also available in: Unified diff
Modify admin configuration to include default replication policy. Extensively revised the DataONE configuration page, including new wording for intro, improved tooltips throughout, new arrangement of sections, and other cosmetic changes.