Project

General

Profile

« Previous | Next » 

Revision 6092

Modified Metacat to build against the D1_SCHEMA_0_6_1 branch of the dataone schemas by incorporating the 0.6.1-SNAPSHOT version of d1_common and d1_libclient libraries, and refactoring Metacat code references to the d1 schema changed types.

View differences:

MetacatPopulator.java
25 25
 */
26 26
package edu.ucsb.nceas.metacat.util;
27 27

  
28
import java.io.ByteArrayInputStream;
29
import java.io.InputStream;
30
import java.io.OutputStream;
31
import java.net.HttpURLConnection;
32
import java.net.URL;
28 33
import java.security.MessageDigest;
29
import java.util.*;
30
import java.io.*;
31
import java.net.*;
34
import java.util.Calendar;
35
import java.util.Date;
36
import java.util.Vector;
32 37

  
33 38
import javax.activation.DataHandler;
34 39
import javax.activation.DataSource;
35
import javax.mail.MessagingException;
36 40
import javax.mail.internet.MimeBodyPart;
37 41
import javax.mail.internet.MimeMultipart;
38
import javax.xml.parsers.DocumentBuilder;
39
import javax.xml.parsers.DocumentBuilderFactory;
40
import javax.xml.parsers.ParserConfigurationException;
41 42

  
42 43
import org.apache.commons.io.IOUtils;
43

  
44
import edu.ucsb.nceas.metacat.MetaCatServlet;
45
import edu.ucsb.nceas.metacat.MetacatHandler;
46
import edu.ucsb.nceas.metacat.MetacatResultSet;
47
import edu.ucsb.nceas.metacat.MetacatResultSet.Document;
48
import edu.ucsb.nceas.metacat.dataone.CrudService;
49
import edu.ucsb.nceas.metacat.properties.PropertyService;
50
import edu.ucsb.nceas.metacat.restservice.InputStreamDataSource;
51

  
52
import org.dataone.service.exceptions.InvalidSystemMetadata;
53
import org.dataone.service.exceptions.ServiceFailure;
44
import org.dataone.client.D1Client;
45
import org.dataone.client.MNode;
46
import org.dataone.eml.DataoneEMLParser;
47
import org.dataone.eml.EMLDocument;
48
import org.dataone.eml.EMLDocument.DistributionMetadata;
54 49
import org.dataone.service.types.AuthToken;
55 50
import org.dataone.service.types.Checksum;
56 51
import org.dataone.service.types.ChecksumAlgorithm;
52
import org.dataone.service.types.Identifier;
57 53
import org.dataone.service.types.NodeReference;
58 54
import org.dataone.service.types.ObjectFormat;
59
import org.dataone.service.types.Principal;
55
import org.dataone.service.types.Subject;
60 56
import org.dataone.service.types.SystemMetadata;
61
import org.dataone.service.types.Identifier;
62
import org.dataone.client.D1Client;
63
import org.dataone.client.MNode;
64
import org.dataone.eml.DataoneEMLParser;
65
import org.dataone.eml.EMLDocument;
66
import org.dataone.eml.EMLDocument.DistributionMetadata;
67 57

  
68
//import sun.tools.jstat.Identifier;
58
import edu.ucsb.nceas.metacat.MetaCatServlet;
59
import edu.ucsb.nceas.metacat.properties.PropertyService;
60
import edu.ucsb.nceas.metacat.restservice.InputStreamDataSource;
69 61

  
70
import com.gc.iotools.stream.is.InputStreamFromOutputStream;
71

  
72 62
/**
73 63
 * @author berkley
74 64
 * A class to populate a metacat instance based on documents returned from a query
......
309 299
        sm.setSize(doc.doctext.getBytes(MetaCatServlet.DEFAULT_ENCODING).length);
310 300
        
311 301
        //submitter
312
        Principal p = new Principal();
302
        Subject p = new Subject();
313 303
        p.setValue("unknown");
314 304
        sm.setSubmitter(p);
315 305
        sm.setRightsHolder(p);

Also available in: Unified diff