Project

General

Profile

« Previous | Next » 

Revision 6124

Added by Chris Jones almost 13 years ago

Merged in the D1_0_6_2_BRANCH changes that include the transition from ObjectFormat calls to ObjectFormatCache calls.

View differences:

CNCoreImpl.java
27 27 
import java.util.Timer;
28 28 

  		




  29
  29
  
    
import org.apache.log4j.Logger;


  		




  30
  
  
    
import org.dataone.service.cn.tier1.CNCore;


  		




  
  30
  
    
import org.dataone.service.cn.CNCore;


  		




  31
  31
  
    
import org.dataone.service.exceptions.IdentifierNotUnique;


  		




  32
  32
  
    
import org.dataone.service.exceptions.InsufficientResources;


  		




  33
  33
  
    
import org.dataone.service.exceptions.InvalidRequest;


  		




  ......




  43
  43
  
    
import org.dataone.service.types.Log;


  		




  44
  44
  
    
import org.dataone.service.types.NodeList;


  		




  45
  45
  
    
import org.dataone.service.types.ObjectFormat;


  		




  
  46
  
    
import org.dataone.service.types.ObjectFormatIdentifier;


  		




  
  47
  
    
import org.dataone.service.types.ObjectFormatList;


  		




  46
  48
  
    
import org.dataone.service.types.Session;


  		




  47
  49
  
    
import org.dataone.service.types.SystemMetadata;


  		




  48
  50
  
    
import org.joda.time.DateTime;


  		




  ......




  129
  131
  
    
        return true;


  		




  130
  132
  
    
    }


  		




  131
  133
  
    

  		




  132
  
  
    
	@Override


  		




  133
  
  
    
	public ObjectFormat getFormat(Identifier arg0) throws InvalidRequest,


  		




  134
  
  
    
			ServiceFailure, NotFound, InsufficientResources, NotImplemented {


  		




  135
  
  
    
		// TODO Auto-generated method stub


  		




  136
  
  
    
		return null;


  		




  137
  
  
    
	}


  		




  138
  134
  
    

  		




  139
  
  
    
	@Override


  		




  140
  
  
    
	public Log getLogRecords(DateTime arg0, DateTime arg1, Event arg2)


  		




  141
  
  
    
			throws InvalidToken, InvalidRequest, ServiceFailure, NotAuthorized,


  		




  142
  
  
    
			NotImplemented {


  		




  143
  
  
    
		// TODO Auto-generated method stub


  		




  144
  
  
    
		return null;


  		




  
  135
  
    
  @Override


  		




  
  136
  
    
  public Log getLogRecords(Session arg0, DateTime arg1, DateTime arg2,


  		




  
  137
  
    
    Event arg3) throws InvalidToken, InvalidRequest, ServiceFailure,


  		




  
  138
  
    
    NotAuthorized, NotImplemented {


  		




  
  139
  
    
  	  // TODO Auto-generated method stub


  		




  
  140
  
    
  	  return null;


  		




  
  141
  
    
    }


  		




  
  142
  
    
   @Override


  		




  
  143
  
    
	 public ObjectFormat getFormat(ObjectFormatIdentifier arg0) 


  		




  
  144
  
    
	   throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources, 


  		




  
  145
  
    
	   NotImplemented {


  		




  
  146
  
    
		 // TODO Auto-generated method stub


  		




  
  147
  
    
		 return null;


  		




  145
  148
  
    
	}


  		




  146
  149
  
    

  		




  147
  150
  
    
	@Override


  		




  ......




  150
  153
  
    
		return null;


  		




  151
  154
  
    
	}


  		




  152
  155
  
    

  		




  
  156
  
    
	@Override


  		




  
  157
  
    
  public ObjectFormatList listFormats() throws InvalidRequest, ServiceFailure,


  		




  
  158
  
    
    NotFound, InsufficientResources, NotImplemented {


  		




  
  159
  
    
	  // TODO Auto-generated method stub


  		




  
  160
  
    
	  return null;


  		




  
  161
  
    
  }


  		




  
  162
  
    

  		




  153
  163
  
    
}


  		




  154
  164
  
    

  		












Also available in:  Unified diff