Project

General

Profile

« Previous | Next » 

Revision 6130

organize imports so that it is clearer what dependencies exist on the D1 jars

View differences:

ObjectFormatService.java
27 27
package edu.ucsb.nceas.metacat.service;
28 28

  
29 29
import java.io.ByteArrayInputStream;
30
import java.io.FileInputStream;
31
import java.io.FileNotFoundException;
32 30
import java.io.InputStream;
33 31
import java.sql.SQLException;
34 32
import java.util.HashMap;
35
import java.util.List;
36 33

  
34
import org.apache.log4j.Logger;
35
import org.dataone.client.ObjectFormatCache;
36
import org.dataone.service.types.ObjectFormat;
37
import org.dataone.service.types.ObjectFormatList;
38
import org.dataone.service.types.util.ServiceTypeUtil;
39
import org.jibx.runtime.JiBXException;
40

  
37 41
import edu.ucsb.nceas.metacat.DBUtil;
38 42
import edu.ucsb.nceas.metacat.DocumentImpl;
39 43
import edu.ucsb.nceas.metacat.McdbException;
40 44
import edu.ucsb.nceas.metacat.properties.PropertyService;
41
import edu.ucsb.nceas.metacat.McdbDocNotFoundException;
42 45
import edu.ucsb.nceas.metacat.shared.BaseService;
43 46
import edu.ucsb.nceas.metacat.shared.ServiceException;
44
import edu.ucsb.nceas.metacat.util.SystemUtil;
45 47
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
46 48

  
47
import org.apache.log4j.Logger;
48

  
49
import org.dataone.client.CNode;
50
import org.dataone.client.D1Client;
51
import org.dataone.client.ObjectFormatCache;
52
import org.dataone.service.exceptions.InsufficientResources;
53
import org.dataone.service.exceptions.InvalidRequest;
54
import org.dataone.service.exceptions.NotFound;
55
import org.dataone.service.exceptions.NotImplemented;
56
import org.dataone.service.exceptions.ServiceFailure;
57
import org.dataone.service.types.Identifier;
58
import org.dataone.service.types.ObjectFormat;
59
import org.dataone.service.types.ObjectFormatList;
60
//import org.dataone.service.types.ObjectFormatList;
61
import org.dataone.service.types.util.ServiceTypeUtil;
62
import org.jibx.runtime.JiBXException;
63

  
64 49
/**
65 50
 *  The ObjectFormatService manages the list of object formats registered
66 51
 *  within Metacat.  This includes schema types, mime types, and other
......
100 85
  private String coordinatingNodeBaseURL = null;
101 86
  
102 87
  /* The D1 coordinating node reference object used for object format lookups */
103
  private CNode cn = null;
88
  //private CNode cn = null;
104 89

  
105 90
  /* The D1 node type for this instance of metacat */
106 91
  private String nodeType;

Also available in: Unified diff