Project

General

Profile

« Previous | Next » 

Revision 6803

Added by ben leinfelder over 12 years ago

new jars with many changes -- including new CN methods: ping, describe, listChecksumAlgorithm. Removed MN.setAccessPolicy. Refactored CN.setOwner() to CN.setRightsHolder().

View differences:

D1Admin.java
36 36 
import org.dataone.client.CNode;
37 37 
import org.dataone.client.D1Client;
38 38 
import org.dataone.client.auth.CertificateManager;
39 
import org.dataone.service.exceptions.BaseException;
39 40 
import org.dataone.service.exceptions.IdentifierNotUnique;
40 41 
import org.dataone.service.exceptions.InvalidRequest;
42 
import org.dataone.service.exceptions.InvalidToken;
41 43 
import org.dataone.service.exceptions.NotAuthorized;
42 44 
import org.dataone.service.exceptions.NotFound;
43 45 
import org.dataone.service.exceptions.NotImplemented;
......
354 356 
	            PropertyService.setProperty("dataone.memberNodeId", mnodeRef.getValue());
355 357
356 358 
            }
357 
        } catch (ServiceFailure e) {
359 
        } catch (BaseException e) {
358 360 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
359 
        } catch (NotFound e) {
360 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
361 
        } catch (NotImplemented e) {
362 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
363 
        } catch (NotAuthorized e) {
364 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
365 
        } catch (InvalidRequest e) {
366 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
367 
        } catch (IdentifierNotUnique e) {
368 
            logMetacat.warn("Could not register as node with DataONE (" + e.getCode() + "/" + e.getDetail_code() + "): " + e.getDescription());
369 361 
        } catch (PropertyNotFoundException e) {
370 362 
            logMetacat.warn("Could not find the location for client certificates: " + e.getMessage());
371 363 
        } catch (GeneralPropertyException e) {

Also available in: Unified diff