Project

General

Profile

« Previous | Next » 

Revision 6934

use RC-1 Dataone jars

View differences:

test/edu/ucsb/nceas/metacat/dataone/MockCNode.java
29 29
import org.dataone.service.exceptions.ServiceFailure;
30 30
import org.dataone.service.types.v1.Identifier;
31 31
import org.dataone.service.types.v1.Session;
32
import org.dataone.service.types.v1.Subject;
32 33
import org.dataone.service.types.v1.SystemMetadata;
33 34

  
34 35
/**
......
57 58
     * Always return true that the reservation exists
58 59
     */
59 60
    @Override
60
    public boolean hasReservation(Session session, Identifier pid) 
61
    public boolean hasReservation(Session session, Subject subject, Identifier pid) 
61 62
    	throws InvalidToken, ServiceFailure, NotFound,
62 63
        NotAuthorized, IdentifierNotUnique, NotImplemented {
63 64
    	// always return true
src/edu/ucsb/nceas/metacat/dataone/MNodeService.java
1187 1187
                    "Could not set the replication status on the CN (NotFound): " + 
1188 1188
                    e.getMessage());
1189 1189
            
1190
        } catch (VersionMismatch e) {
1191
            throw new ServiceFailure("2151",
1192
                    "Could not set the replication status on the CN (VersionMismatch): " + 
1193
                    e.getMessage());
1194
            
1195 1190
        }
1196 1191

  
1197 1192

  
src/edu/ucsb/nceas/metacat/dataone/CNodeService.java
937 937
   */
938 938

  
939 939
  @Override
940
  public boolean hasReservation(Session session, Identifier pid) 
940
  public boolean hasReservation(Session session, Subject subject, Identifier pid) 
941 941
      throws InvalidToken, ServiceFailure, NotFound, NotAuthorized, IdentifierNotUnique, 
942 942
      NotImplemented, InvalidRequest {
943 943
  

Also available in: Unified diff