Project

General

Profile

« Previous | Next » 

Revision 6343

Added by Chris Jones over 13 years ago

In MNodeService.getCapabilities(), set the serviceVersion for each service supported.

View differences:

src/edu/ucsb/nceas/metacat/dataone/MNodeService.java
664 664
    String nodeUrl = null;
665 665
    String nodeDesc = null;
666 666
    String nodeType = null;
667
    String mnCoreServiceVersion = null;
668
    String mnReadServiceVersion = null;
669
    String mnAuthorizationServiceVersion = null;
670
    String mnStorageServiceVersion = null;
671
    String mnReplicationServiceVersion = null;
667 672

  
668 673
    try
669 674
    {
......
672 677
        nodeUrl = SystemUtil.getContextURL() + "/d1/";
673 678
        nodeDesc = PropertyService.getProperty("dataone.nodeDescription");
674 679
        nodeType = PropertyService.getProperty("dataone.nodeType");
680
        mnCoreServiceVersion = 
681
        	PropertyService.getProperty("dataone.mncore.serviceVersion");
682
        mnReadServiceVersion = 
683
        	PropertyService.getProperty("dataone.mnread.serviceVersion");
684
        mnAuthorizationServiceVersion = 
685
        	PropertyService.getProperty("dataone.mnauthorization.serviceVersion");
686
        mnStorageServiceVersion = 
687
        	PropertyService.getProperty("dataone.mnstorage.serviceVersion");
688
        mnReplicationServiceVersion = 
689
        	PropertyService.getProperty("dataone.mnreplication.serviceVersion");
675 690
        
676 691
    } catch(PropertyNotFoundException pnfe) {
677 692
        logMetacat.error("MNodeService.getCapabilities(): " +
......
694 709
	  Services services = new Services();
695 710
	  Service sMNRead = new Service();
696 711
	  sMNRead.setName("MNRead");
712
	  sMNRead.setVersion(mnReadServiceVersion);
697 713
	  Service sMNCore = new Service();
698 714
	  sMNCore.setName("MNCore");
715
	  sMNCore.setVersion(mnCoreServiceVersion);
699 716
	  Service sMNAuthorization = new Service();
700 717
	  sMNAuthorization.setName("MNAuthorization");
718
	  sMNAuthorization.setVersion(mnAuthorizationServiceVersion);
701 719
	  Service sMNStorage = new Service();
702 720
	  sMNStorage.setName("MNStorage");
721
	  sMNStorage.setVersion(mnStorageServiceVersion);
703 722
	  Service sMNReplication = new Service();
704 723
	  sMNReplication.setName("MNReplication");
724
	  sMNReplication.setVersion(mnReplicationServiceVersion);
705 725
	  services.addService(sMNRead);
706 726
	  services.addService(sMNCore);
707 727
	  services.addService(sMNAuthorization);

Also available in: Unified diff