Revision 6033
Added by Chris Jones over 13 years ago
| lib/metacat.properties | ||
|---|---|---|
| 482 | 482 |
|
| 483 | 483 |
|
| 484 | 484 |
############# DataONE Section ####################################### |
| 485 |
dataone.coordinatingNodeBaseURL=http://cn.dataone.org |
|
| 485 | 486 |
dataone.memberNodeId=http://knb-mn.ecoinformatics.org |
| 486 | 487 |
dataone.nodeName=metacat |
| 488 |
dataone.nodeType=mn |
|
| 487 | 489 |
dataone.nodeDescription=A metacat member node. |
| 488 | 490 |
dataone.scienceMetadataSchema1=eml://ecoinformatics.org/eml-2.0.0 |
| 489 | 491 |
dataone.scienceMetadataSchema2=eml://ecoinformatics.org/eml-2.0.1 |
| src/edu/ucsb/nceas/metacat/restservice/ResourceHandler.java | ||
|---|---|---|
| 738 | 738 |
String nodeId = null; |
| 739 | 739 |
String nodeUrl = null; |
| 740 | 740 |
String nodeDesc = null; |
| 741 |
String nodeType = null; |
|
| 741 | 742 |
|
| 742 | 743 |
try |
| 743 | 744 |
{
|
| ... | ... | |
| 746 | 747 |
nodeUrl = PropertyService.getProperty("dataone.memberNodeId") + "/" +
|
| 747 | 748 |
PropertyService.getProperty("application.context") + "/d1/";
|
| 748 | 749 |
nodeDesc = PropertyService.getProperty("dataone.nodeDescription");
|
| 750 |
nodeType = PropertyService.getProperty("dataone.nodeType");
|
|
| 749 | 751 |
} |
| 750 | 752 |
catch(PropertyNotFoundException pnfe) |
| 751 | 753 |
{
|
| ... | ... | |
| 761 | 763 |
n.setBaseURL(nodeUrl); |
| 762 | 764 |
n.setDescription(nodeDesc); |
| 763 | 765 |
n.setName(nodeName + " -- WAR version WARVERSION"); |
| 764 |
n.setType(NodeType.convert("mn"));
|
|
| 766 |
n.setType(NodeType.convert(nodeType));
|
|
| 765 | 767 |
|
| 766 | 768 |
//create the services |
| 767 | 769 |
Service mnCrud03 = new Service(); |
Also available in: Unified diff
Removed hardcoded D1 node type in ResourceHandler and added in a new 'dataone.nodeType' property. Also added 'dataone.coordinatingNodeBaseURL' property which points to the CN that stores the authoritative object format list. If this instance of Metacat is a CN, it may point to itself.