Revision 7175
Added by ben leinfelder about 12 years ago
| D1Admin.java | ||
|---|---|---|
| 337 | 337 |
} |
| 338 | 338 |
|
| 339 | 339 |
// dataone system metadata generation |
| 340 |
boolean smGenerated = Boolean.parseBoolean(PropertyService.getProperty("dataone.systemmetadata.generated"));
|
|
| 341 |
if (!smGenerated) {
|
|
| 342 |
GenerateSystemMetadata systemMetadataUpgrade = new GenerateSystemMetadata(); |
|
| 343 |
systemMetadataUpgrade.upgrade(); |
|
| 344 |
// NOTE: this runs in a thread and marks SM generated when thatthread completes |
|
| 345 |
} |
|
| 346 |
|
|
| 347 |
// Generate ORE, if we haven't |
|
| 348 |
boolean oreGenerated = Boolean.parseBoolean(PropertyService.getProperty("dataone.ore.generated"));
|
|
| 349 |
if (!oreGenerated) {
|
|
| 350 |
GenerateORE gore = new GenerateORE(); |
|
| 351 |
gore.upgrade(); |
|
| 352 |
PropertyService.setProperty("dataone.ore.generated", Boolean.TRUE.toString());
|
|
| 353 |
} |
|
| 340 |
// NOTE: commented this out - we can generate this after the registration/configuration |
|
| 341 |
// it will be more controlled and deliberate that way -BRL |
|
| 342 |
// boolean smGenerated = Boolean.parseBoolean(PropertyService.getProperty("dataone.systemmetadata.generated"));
|
|
| 343 |
// if (!smGenerated) {
|
|
| 344 |
// GenerateSystemMetadata systemMetadataUpgrade = new GenerateSystemMetadata(); |
|
| 345 |
// systemMetadataUpgrade.upgrade(); |
|
| 346 |
// // NOTE: this runs in a thread and marks SM generated when thatthread completes |
|
| 347 |
// } |
|
| 348 |
// |
|
| 349 |
// // Generate ORE, if we haven't |
|
| 350 |
// boolean oreGenerated = Boolean.parseBoolean(PropertyService.getProperty("dataone.ore.generated"));
|
|
| 351 |
// if (!oreGenerated) {
|
|
| 352 |
// GenerateORE gore = new GenerateORE(); |
|
| 353 |
// gore.upgrade(); |
|
| 354 |
// PropertyService.setProperty("dataone.ore.generated", Boolean.TRUE.toString());
|
|
| 355 |
// } |
|
| 354 | 356 |
|
| 355 | 357 |
// write the backup properties to a location outside the |
| 356 | 358 |
// application directories so they will be available after |
Also available in: Unified diff
instead of generating SM and ORE maps during dataone configuration/MN registration, moved this all to the replication admin screen where we can target generation for specific nodes. That way it's more controlled as to when and where we generate DataONE required content.
https://redmine.dataone.org/issues/2740