Revision 23de68fc
Added by Andreas Müller almost 2 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategy.java | ||
|---|---|---|
| 25 | 25 |
import java.util.Set; |
| 26 | 26 |
import java.util.UUID; |
| 27 | 27 |
|
| 28 |
import org.apache.log4j.Logger; |
|
| 28 |
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
|
|
| 29 | 29 |
|
| 30 | 30 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| ... | ... | |
| 40 | 40 |
*/ |
| 41 | 41 |
public class DefaultMergeStrategy extends StrategyBase implements IMergeStrategy {
|
| 42 | 42 |
private static final long serialVersionUID = -8513956338156791995L; |
| 43 |
private static final Logger logger = Logger.getLogger(DefaultMergeStrategy.class); |
|
| 43 |
private static final Logger logger = LogManager.getLogger(DefaultMergeStrategy.class);
|
|
| 44 | 44 |
final static UUID uuid = UUID.fromString("d85cd6c3-0147-452c-8fed-bbfb82f392f6");
|
| 45 | 45 |
|
| 46 | 46 |
public static DefaultMergeStrategy NewInstance(Class<? extends CdmBase> mergeClazz){
|
Also available in: Unified diff
ref #9359 upgrade cdmlib to log4j 2