Projects >> sip-creator >>b57b6e484a2630f8fce7d8441057a997bd9c8475

Chunk
Conflicting content
package eu.delving.sip;

<<<<<<< HEAD
import eu.delving.metadata.*;
import eu.europeana.sip.core.*;
import org.apache.commons.io.IOUtils;

import javax.xml.stream.XMLStreamException;
import java.io.*;
import java.util.ArrayList;
=======
import eu.delving.groovy.DiscardRecordException;
import eu.delving.groovy.GroovyCodeResource;
import eu.delving.groovy.MappingException;
import eu.delving.groovy.MappingRunner;
import eu.delving.groovy.MetadataRecord;
import eu.delving.groovy.MetadataRecordFactory;
import eu.delving.metadata.MetadataException;
import eu.delving.metadata.MetadataModel;
import eu.delving.metadata.MetadataModelImpl;
import eu.delving.metadata.RecordMapping;
import eu.delving.metadata.RecordValidator;
import eu.delving.metadata.ValidationException;
import groovy.util.Node;

import javax.xml.stream.XMLStreamException;
import java.io.FileNotFoundException;
>>>>>>> a985737511680f5656afdcce2adab625644bba5c
import java.util.Arrays;
import java.util.Map;
Solution content
package eu.delving.sip;

import eu.delving.groovy.DiscardRecordException;
import eu.delving.groovy.GroovyCodeResource;
import eu.delving.groovy.MappingException;
import eu.delving.groovy.MappingRunner;
import eu.delving.groovy.MetadataRecord;
import eu.delving.groovy.MetadataRecordFactory;
import eu.delving.metadata.MetadataException;
import eu.delving.metadata.MetadataModel;
import eu.delving.metadata.MetadataModelImpl;
import eu.delving.metadata.RecordMapping;
import eu.delving.metadata.RecordValidator;
import eu.delving.metadata.ValidationException;
import groovy.util.Node;

import javax.xml.stream.XMLStreamException;
import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.Map;
File
MappingEngine.java
Developer's decision
Version 2
Kind of conflict
Import