Revision 6367
Added by ben leinfelder almost 13 years ago
| ReplicationService.java | ||
|---|---|---|
| 58 | 58 |
|
| 59 | 59 |
import org.apache.log4j.Logger; |
| 60 | 60 |
import org.dataone.service.types.v1.SystemMetadata; |
| 61 |
import org.dataone.service.types.util.ServiceTypeUtil;
|
|
| 61 |
import org.dataone.service.util.TypeMarshaller;
|
|
| 62 | 62 |
import org.xml.sax.InputSource; |
| 63 | 63 |
import org.xml.sax.SAXException; |
| 64 | 64 |
import org.xml.sax.XMLReader; |
| ... | ... | |
| 586 | 586 |
// process system metadata |
| 587 | 587 |
if (systemMetadataXML != null) {
|
| 588 | 588 |
SystemMetadata sysMeta = |
| 589 |
(SystemMetadata) ServiceTypeUtil.deserializeServiceType(
|
|
| 589 |
TypeMarshaller.unmarshalTypeFromStream(
|
|
| 590 | 590 |
SystemMetadata.class, |
| 591 | 591 |
new ByteArrayInputStream(systemMetadataXML.getBytes("UTF-8")));
|
| 592 | 592 |
String guid = sysMeta.getIdentifier().getValue(); |
| ... | ... | |
| 867 | 867 |
// process system metadata |
| 868 | 868 |
if (systemMetadataXML != null) {
|
| 869 | 869 |
SystemMetadata sysMeta = |
| 870 |
(SystemMetadata) ServiceTypeUtil.deserializeServiceType(
|
|
| 870 |
TypeMarshaller.unmarshalTypeFromStream(
|
|
| 871 | 871 |
SystemMetadata.class, |
| 872 | 872 |
new ByteArrayInputStream(systemMetadataXML.getBytes("UTF-8")));
|
| 873 | 873 |
String guid = sysMeta.getIdentifier().getValue(); |
| ... | ... | |
| 977 | 977 |
String guid = IdentifierManager.getInstance().getGUID(doc.getDocID(), doc.getRev()); |
| 978 | 978 |
SystemMetadata systemMetadata = IdentifierManager.getInstance().getSystemMetadata(guid); |
| 979 | 979 |
ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
| 980 |
ServiceTypeUtil.serializeServiceType(SystemMetadata.class, systemMetadata, baos);
|
|
| 980 |
TypeMarshaller.marshalTypeToOutputStream(systemMetadata, baos);
|
|
| 981 | 981 |
String systemMetadataXML = baos.toString("UTF-8");
|
| 982 | 982 |
sb.append("<systemMetadata>");
|
| 983 | 983 |
sb.append(systemMetadataXML); |
| ... | ... | |
| 1038 | 1038 |
// serialize the System Metadata as XML |
| 1039 | 1039 |
SystemMetadata systemMetadata = IdentifierManager.getInstance().getSystemMetadata(guid); |
| 1040 | 1040 |
ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
| 1041 |
ServiceTypeUtil.serializeServiceType(SystemMetadata.class, systemMetadata, baos);
|
|
| 1041 |
TypeMarshaller.marshalTypeToOutputStream(systemMetadata, baos);
|
|
| 1042 | 1042 |
systemMetadataXML = baos.toString("UTF-8");
|
| 1043 | 1043 |
|
| 1044 | 1044 |
// get a writer for sending back to response |
| ... | ... | |
| 1078 | 1078 |
// process system metadata |
| 1079 | 1079 |
if (systemMetadataXML != null) {
|
| 1080 | 1080 |
SystemMetadata sysMeta = |
| 1081 |
(SystemMetadata) ServiceTypeUtil.deserializeServiceType(
|
|
| 1081 |
TypeMarshaller.unmarshalTypeFromStream(
|
|
| 1082 | 1082 |
SystemMetadata.class, |
| 1083 | 1083 |
new ByteArrayInputStream(systemMetadataXML.getBytes("UTF-8")));
|
| 1084 | 1084 |
if (!IdentifierManager.getInstance().identifierExists(guid)) {
|
Also available in: Unified diff
remove ServiceTypeUtil - replace with TypeMarshaller