import java.io.Serializable;
import java.util.UUID;
-import org.apache.log4j.Logger;
-
import eu.etaxonomy.cdm.model.common.ICdmBase;
/**
private static final long serialVersionUID = 3446993458279371682L;
- @SuppressWarnings("unused")
- private static final Logger logger = Logger .getLogger(UuidAndTitleCache.class);
-
private Class<? extends T> type;
final private UUID uuid;
private Integer id;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.util.ReflectionUtils;
import eu.etaxonomy.cdm.api.service.pager.Pager;
*/
public class CacheLoader {
- private static final Logger logger = Logger.getLogger(CacheLoader.class);
+ private static final Logger logger = LogManager.getLogger(CacheLoader.class);
private static boolean isRecursiveEnabled = true;
import java.util.Iterator;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.SessionFactory;
import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources;
*/
public class CdmModelCacher {
- private static final Logger logger = Logger.getLogger(CdmModelCacher.class);
+ private static final Logger logger = LogManager.getLogger(CdmModelCacher.class);
public static String HB_CONFIG_FILE_PATH= "/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml";
import java.io.IOException;
import java.net.URISyntaxException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheException;
public class CdmRemoteCacheManager {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmRemoteCacheManager.class);
+ private static final Logger logger = LogManager.getLogger(CdmRemoteCacheManager.class);
private Cache cdmlibModelCache;
import javax.management.MBeanServer;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.cache.CdmCacherBase;
import eu.etaxonomy.cdm.model.ICdmCacher;
*/
public class CdmTransientEntityCacher implements ICdmCacher {
- private static final Logger logger = Logger.getLogger(CdmTransientEntityCacher.class);
+ private static final Logger logger = LogManager.getLogger(CdmTransientEntityCacher.class);
//the key for this cacher within the CacheManager
private final String cacheId;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.proxy.HibernateProxy;
*/
public class EntityCacherDebugResult {
- private static final Logger logger = Logger.getLogger(EntityCacherDebugResult.class);
+ private static final Logger logger = LogManager.getLogger(EntityCacherDebugResult.class);
private Map<CdmEntityInfo, CdmEntityInfo> duplicateCdmEntityMap;
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @author a.mueller
*/
public class CdmUtils {
- private static final Logger logger = Logger.getLogger(CdmUtils.class);
+ private static final Logger logger = LogManager.getLogger(CdmUtils.class);
static private boolean urlIsJarOrBundle(URL url){
return url.getProtocol().startsWith("jar") || url.getProtocol().startsWith("bundleresource");
*/\r
package eu.etaxonomy.cdm.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* An instance of this class represents an method result that contains 2 variables. The variables may be typified.\r
* @since 30.10.2008\r
*/\r
public class DoubleResult<S extends Object, T extends Object> {\r
- private static final Logger logger = Logger.getLogger(DoubleResult.class);\r
+\r
+ private static final Logger logger = LogManager.getLogger(DoubleResult.class);\r
\r
private S firstResult = null;\r
private T secondResult = null;\r
if (logger.isDebugEnabled()){logger.debug("Constructor");}\r
}\r
\r
-\r
public DoubleResult(S firstResult, T secondResult) {\r
this.firstResult = firstResult;\r
this.secondResult = secondResult;\r
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* DynamicBatch: a JVM resources aware batch manager.
*/
public class DynamicBatch {
- public static final Logger logger = Logger.getLogger(DynamicBatch.class);
+ public static final Logger logger = LogManager.getLogger(DynamicBatch.class);
int batchSize;
int batchItemCount = -1;
import java.util.Locale;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
* @since 18.11.2008
*/
public class ExcelUtils {
- private static final Logger logger = Logger.getLogger(ExcelUtils.class);
+
+ private static final Logger logger = LogManager.getLogger(ExcelUtils.class);
/** Reads all rows of an Excel worksheet */
public static List<Map<String, String>> parseXLS(URI uri) throws FileNotFoundException {
/**\r
* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
-* \r
+*\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
-\r
package eu.etaxonomy.cdm.common;\r
\r
import java.io.File;\r
import java.io.InputStream;\r
import java.io.OutputStream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
* @since 20.11.2008\r
- * @version 1.0\r
*/\r
public class FileCopy {\r
- private static final Logger logger = Logger.getLogger(FileCopy.class);\r
+\r
+ private static final Logger logger = LogManager.getLogger(FileCopy.class);\r
\r
// overwrite constants\r
public static final int DO_OVERWRITE = 1;\r
// default values\r
private static int bufferSize = 4 * 1024;\r
private static int overwrite = DO_OVERWRITE;\r
- \r
+\r
/**\r
- * Copies a File to another directory \r
+ * Copies a File to another directory\r
* @param sourceFile\r
* @param destinationDirectory\r
* @param destFileName\r
}\r
InputStream in = new FileInputStream(sourceFile);\r
copy(in, destinationDirectory, destFileName);\r
- \r
+\r
if (!destinationDirectory.isDirectory()) {\r
logger.warn("Not a directory: " + destinationDirectory.getName());\r
return false;\r
File destinationFile = new File(destinationDirectory, destFileName);\r
\r
OutputStream out = new FileOutputStream(destinationFile);\r
- \r
+\r
return copy(in, out);\r
}\r
- \r
+\r
public static boolean copy(InputStream in, File destinationDirectory, String destFileName)\r
throws IOException {\r
- \r
+\r
if (!destinationDirectory.isDirectory()) {\r
throw new IOException("Destination is not a directory");\r
}\r
}\r
File destinationFile = new File(destinationDirectory, destFileName);\r
OutputStream out = new FileOutputStream(destinationFile);\r
- \r
+\r
return copy(in, out);\r
-}\r
- \r
+ }\r
+\r
public static boolean copy(InputStream in, OutputStream out)\r
throws IOException {\r
byte[] buffer = new byte[bufferSize];\r
return true;\r
}\r
\r
- \r
public static boolean copy(String source, String destDirectory, String destFileName)\r
throws IOException {\r
File sourceFile = new File(source);\r
File destinationDir = new File(destDirectory);\r
return copy(sourceFile, destinationDir, destFileName);\r
}\r
- \r
+\r
public static boolean copy(String source, String destDirectory)\r
throws IOException {\r
return copy(source, destDirectory, null);\r
}\r
\r
-\r
/**\r
- * True if file \r
+ * True if file\r
* @param file File destination\r
* @return true if data can be copied, false otherwise\r
*/\r
return false;\r
}\r
}\r
-\r
-\r
-}\r
- \r
- \r
-\r
-\r
+}
\ No newline at end of file
/**\r
- *\r
- */\r
+* Copyright (C) 2016 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
package eu.etaxonomy.cdm.common;\r
\r
import java.util.regex.Pattern;\r
\r
-import org.apache.log4j.Logger;\r
-\r
/**\r
* @author a.mueller\r
* @since 2013-Aug-02\r
*/\r
public class GeneralParser {\r
\r
- @SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GeneralParser.class);\r
-\r
static String isbnPatternStr = "^(ISBN\\s*)?(\\d-?){9}((\\d-?){3})?(\\d|X)$";\r
static Pattern isbnPattern;\r
\r
import java.lang.management.MemoryUsage;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @author a.kohlbecker
*/
public class JvmMonitor {
- public static final Logger logger = Logger.getLogger(JvmMonitor.class);
+ public static final Logger logger = LogManager.getLogger(JvmMonitor.class);
private long gcTimeLast = 0;
/**\r
* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
-* \r
+*\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
package eu.etaxonomy.cdm.common;\r
\r
-import org.apache.log4j.Logger;\r
-\r
-//import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* Wrapps a result object so it can be used as method parameter and changed within the method.\r
* __}<br>\r
* }\r
* </code>\r
- * Here a String is returned but the boolean value may also be changed and it's value is useable \r
+ * Here a String is returned but the boolean value may also be changed and it's value is useable\r
* by the calling method\r
- * \r
+ *\r
* @author a.mueller\r
* @since 01.11.2008\r
- * @version 1.0\r
*/\r
public class ResultWrapper<T> {\r
- private static final Logger logger = Logger.getLogger(ResultWrapper.class);\r
+\r
+ private static final Logger logger = LogManager.getLogger(ResultWrapper.class);\r
\r
public static final ResultWrapper<Boolean> NewInstance(Boolean value){\r
ResultWrapper<Boolean> result = new ResultWrapper<Boolean>();\r
if (logger.isDebugEnabled()){logger.debug("New Instance");}\r
return result;\r
}\r
- \r
- T object;\r
\r
- /**\r
- * @return the object\r
- */\r
+ private T object;\r
+\r
public T getValue() {\r
return object;\r
}\r
\r
- /**\r
- * @param object the object to set\r
- */\r
public void setValue(T value) {\r
this.object = value;\r
}\r
import java.net.HttpURLConnection;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.kohlbecker\r
*/\r
public class StreamUtils {\r
\r
- public static final Logger logger = Logger.getLogger(StreamUtils.class);\r
+ public static final Logger logger = LogManager.getLogger(StreamUtils.class);\r
private static final int BUFFER_SIZE = 4096;\r
\r
/**\r
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @author n.hoffmann
* @since Sep 23, 2010
*/
public class UriUtils {
- private static final Logger logger = Logger.getLogger(UriUtils.class);
+ private static final Logger logger = LogManager.getLogger(UriUtils.class);
protected static final String URI_IS_NOT_ABSOLUTE = "URI is not absolute (protocol is missing)";
/**\r
* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
-* \r
+*\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.jdom.Attribute;\r
import org.jdom.Document;\r
import org.jdom.Element;\r
import org.jdom.output.XMLOutputter;\r
\r
public class XmlHelp {\r
- private static final Logger logger = Logger.getLogger(XmlHelp.class);\r
+ private static final Logger logger = LogManager.getLogger(XmlHelp.class);\r
\r
- public final static Format prettyFormat = Format.getPrettyFormat(); \r
+ public final static Format prettyFormat = Format.getPrettyFormat();\r
/**\r
* Writes the Document doc to the specified file\r
* @param doc\r
* @param path\r
* @param fileName\r
* @return true, if no error\r
- * \r
- * TODO throw the FileNotFoundException and handle in the calling method. That is more likely the place where you can do \r
+ *\r
+ * TODO throw the FileNotFoundException and handle in the calling method. That is more likely the place where you can do\r
* something about the problem\r
*/\r
static public boolean saveToXml(Document doc, String path, String fileName, Format format ){\r
if (! fileName.endsWith(".xml")){\r
fileName += ".xml";\r
}\r
- FileOutputStream outFile = new FileOutputStream(path + File.separator + fileName); \r
+ FileOutputStream outFile = new FileOutputStream(path + File.separator + fileName);\r
return saveToXml(doc, outFile, format);\r
} catch (FileNotFoundException e) {\r
logger.error("FileNotFoundException in saveToXml()");\r
return false;\r
}\r
- \r
+\r
}\r
- \r
+\r
/**\r
* Writes the Document doc to the specified file\r
* @param doc\r
* @param path\r
* @param fileName\r
* @return true, if no error\r
- * \r
- * TODO throw the IOException and handle in the calling method. That is more likely the place where you can do \r
+ *\r
+ * TODO throw the IOException and handle in the calling method. That is more likely the place where you can do\r
* something about the problem\r
*/\r
static public boolean saveToXml(Document doc, OutputStream outStream, Format format ){\r
} catch (IOException e) {\r
logger.error("IOException in saveToXml()");\r
return false;\r
- } \r
+ }\r
}\r
- \r
+\r
static public Element getFirstAttributedChild(Element parent, String elementName, String attributeName, String attributeValue){\r
Namespace ns = parent.getNamespace();\r
- \r
+\r
List<Element> elList = getChildren(parent, elementName, ns);\r
for (Element el : elList){\r
Attribute attr = el.getAttribute(attributeName);\r
}\r
return null;\r
}\r
- \r
+\r
static public List<Element> getAttributedChildList(Element parent, String elementName, String attributeName){\r
List<Element> resultList = new ArrayList<Element>();\r
Namespace ns = parent.getNamespace();\r
}\r
return resultList;\r
}\r
- \r
+\r
/**\r
- * Returns a list of children with the given element name and with a given attribute name and \r
+ * Returns a list of children with the given element name and with a given attribute name and\r
* a given value for this attribute.<BR>\r
* The value comparison is case insensitive.\r
* @param parent\r
private static List<Element> getChildren(Element parent, String elementName,Namespace ns) {\r
return parent.getChildren(elementName, ns);\r
}\r
- \r
+\r
public static String getChildAttributeValue(Element element, String childElementName, Namespace childElementNamespace, String childAttributeName, Namespace childAttributeNamespace){\r
Element child = element.getChild(childElementName, childElementNamespace);\r
if (child == null){\r
}\r
return childAttribute.getValue();\r
}\r
- \r
+\r
public static String getChildContent(Element element, String childElementName, Namespace childElementNamespace, String childAttributeName, Namespace childAttributeNamespace){\r
Element child = element.getChild(childElementName, childElementNamespace);\r
if (child == null){\r
*/\r
static public Element getOrAddChild(Element parent, String elementName, String attributeName, String attributeValue){\r
Element result = null;\r
- if (parent != null){ \r
+ if (parent != null){\r
if (attributeName != null){\r
result = getFirstAttributedChild(parent, elementName, attributeName, attributeValue);\r
}else{\r
}\r
return result;\r
}\r
- \r
+\r
static public Element insertXmlRefProperty(Element parent, String strName, String strValue){\r
Namespace ns = parent.getNamespace();\r
Element property = new Element("property", ns);\r
parent.addContent(property);\r
return property;\r
}\r
- \r
+\r
static public Element insertXmlValueProperty(Element parent, String strName, String strValue){\r
Namespace ns = parent.getNamespace();\r
Element property = new Element("property", ns);\r
parent.addContent(property);\r
return property;\r
}\r
- \r
- \r
+\r
+\r
static public Element insertXmlBean(Element parent, String strId, String strClass){\r
Namespace ns = parent.getNamespace();\r
Element bean = new Element("bean", ns);\r
parent.addContent(bean);\r
return bean;\r
}\r
- \r
+\r
\r
/**\r
* returns the root Element in the File xmlFile\r
Element root = doc.getRootElement();\r
return root;\r
}\r
- \r
+\r
/**\r
* returns the root Element in the File xmlFile\r
- * \r
+ *\r
* @param xmlInput\r
* @param elementName\r
* @return\r
- * TODO throw the JDOMException and the IOException and handle in the calling method. That is more likely the place where you can do \r
+ * TODO throw the JDOMException and the IOException and handle in the calling method. That is more likely the place where you can do\r
* something about the problem\r
*/\r
static public Element getRoot(InputStream xmlInput, String elementName){\r
} catch (IOException e) {\r
e.printStackTrace();\r
return null;\r
- } \r
+ }\r
}\r
- \r
+\r
/**\r
* returns the root Element in the File xmlFile\r
* @param xmlInput\r
* @return\r
- * \r
- * TODO throw the IOException and handle in the calling method. That is more likely the place where you can do \r
+ *\r
+ * TODO throw the IOException and handle in the calling method. That is more likely the place where you can do\r
* something about the problem\r
*/\r
static public Element getBeansRoot(InputStream xmlInput){\r
} catch (IOException e) {\r
e.printStackTrace();\r
return null;\r
- } \r
+ }\r
}\r
- \r
+\r
/**\r
* Gets the child element and tests if there is no other child element exists having the same name.\r
- * The result is returned as a pair of thd child element and a boolean value that indicates if the \r
+ * The result is returned as a pair of thd child element and a boolean value that indicates if the\r
* elements cardinality was correct. <BR>\r
- * If there is more then one child element with the child element name \r
+ * If there is more then one child element with the child element name\r
* or if there is no such element and obligatory is <code>true</code> the second part of the result is <code>false</code>\r
* Otherwise it is <code>true</code>.\r
* @param parentElement the parent element\r
static public DoubleResult<Element, Boolean> getSingleChildElement(Element parentElement, String childName, Namespace nsChild, boolean obligatory){\r
DoubleResult<Element, Boolean> result = new DoubleResult<Element, Boolean>();\r
result.setSecondResult(false);\r
- \r
+\r
if (parentElement == null){\r
logger.warn("Parent element is null");\r
return result;\r
List<Element> elList = getChildren(parentElement, childName, nsChild);\r
if (elList.size() > 1){\r
logger.error("Multiple '" + childName + "' elements.");\r
- return result; \r
+ return result;\r
}else if (elList.size() == 0){\r
logger.info("There is no '" + childName + "' element");\r
if (! obligatory){\r
}\r
return result;\r
}\r
- Element childElement = elList.get(0); \r
+ Element childElement = elList.get(0);\r
result.setFirstResult(childElement);\r
result.setSecondResult(true);\r
return result;\r
}\r
- \r
+\r
static public Element getSingleChildElement(ResultWrapper<Boolean> success, Element parentElement, String childName, Namespace nsChild, boolean obligatory){\r
- \r
+\r
if (parentElement == null){\r
logger.warn("Parent element is null");\r
success.setValue(false);\r
if (elList.size() > 1){\r
logger.error("Multiple '" + childName + "' elements.");\r
success.setValue(false);\r
- return null; \r
+ return null;\r
}else if (elList.size() == 0){\r
elList = getChildren(parentElement, childName, null);\r
logger.info("There is no '" + childName + "' element");\r
}\r
return null;\r
}\r
- \r
- Element childElement = elList.get(0); \r
+\r
+ Element childElement = elList.get(0);\r
return childElement;\r
- } \r
+ }\r
\r
static public List<Element> getMultipleChildElement(Element parentElement, String childName, Namespace nsChild, boolean obligatory){\r
- \r
+\r
if (parentElement == null){\r
logger.warn("Parent element is null");\r
return null;\r
}\r
- \r
+\r
List<Element> elList = getChildren(parentElement, childName.trim(), nsChild);\r
- \r
+\r
if (elList.size() == 0){\r
logger.info("There is no '" + childName + "' element");\r
return null;\r
}\r
if (!(contentEl.getAttributeValue(childElementName) == null)){\r
Attribute at = contentEl.getAttribute("ressource");\r
- if (at != null)return at.getValue();\r
+ if (at != null) {\r
+ return at.getValue();\r
+ }\r
}\r
}\r
}\r
return null;\r
- } \r
- \r
+ }\r
+\r
}\r
import java.util.LinkedList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Concurrent queue. Example taken from
*/
public class ConcurrentQueue<T> {
- private static final Logger logger = Logger.getLogger(ConcurrentQueue.class);
+ private static final Logger logger = LogManager.getLogger(ConcurrentQueue.class);
private int capacity;
private List<T> queue = new LinkedList<>();
*/\r
package eu.etaxonomy.cdm.common.media;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author n.hoffmann\r
*/\r
public abstract class MediaInfo {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(MediaInfo.class);\r
+ private static Logger logger = LogManager.getLogger(MediaInfo.class);\r
\r
private String formatName;\r
private String mimeType;\r
import java.io.Serializable;
import java.math.BigDecimal;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* This is a console style progress monitor with prints the progress information to configured {@link Logger} with level {@link Level#INFO}
public class DefaultProgressMonitor implements IProgressMonitor {
private static final long serialVersionUID = 8782649283568146667L;
- private static final Logger logger = Logger.getLogger(DefaultProgressMonitor.class);
+ private static final Logger logger = LogManager.getLogger(DefaultProgressMonitor.class);
public static final DefaultProgressMonitor NewInstance(){
return new DefaultProgressMonitor();
import java.io.Serializable;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Thread class to be used to run monitored jobs
*/
public abstract class RemotingProgressMonitorThread extends Thread {
- private static final Logger logger = Logger.getLogger(RemotingProgressMonitorThread.class);
+ private static final Logger logger = LogManager.getLogger(RemotingProgressMonitorThread.class);
private static ConcurrentHashMap<IRemotingProgressMonitor, RemotingProgressMonitorThread>
monitorsInProgress = new ConcurrentHashMap<>();
import java.io.InputStream;\r
import java.util.regex.Pattern;\r
\r
-import org.apache.log4j.Level;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
*/\r
public class CdmUtilsTest {\r
\r
- private static final Logger logger = Logger.getLogger(CdmUtilsTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmUtilsTest.class);\r
\r
/************************** TESTS ****************************************/\r
\r
@Test\r
public void testFindLibrary() {\r
- if (logger.isEnabledFor(Level.DEBUG)) {logger.debug(CdmUtils.findLibrary(CdmUtils.class));}\r
+ logger.debug("{}", CdmUtils.findLibrary(CdmUtils.class));\r
\r
String library = CdmUtils.findLibrary(CdmUtils.class);\r
String endOfLibrary = "target/classes/eu/etaxonomy/cdm/common/CdmUtils.class";\r
*/
package eu.etaxonomy.cdm.common;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
public class JvmMonitorTest extends Assert{
- public static final Logger logger = Logger.getLogger(JvmMonitorTest.class);
+ public static final Logger logger = LogManager.getLogger(JvmMonitorTest.class);
@Test
public void testGcTime() {
import org.apache.http.NameValuePair;\r
import org.apache.http.client.ClientProtocolException;\r
import org.apache.http.message.BasicNameValuePair;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
public class UriUtilsTest {\r
\r
- private static final Logger logger = Logger.getLogger(UriUtilsTest.class);\r
+ private static final Logger logger = LogManager.getLogger(UriUtilsTest.class);\r
\r
//********************* TESTS **********************************************/\r
\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public class UuidGenerator {\r
- private static final Logger logger = Logger.getLogger(UuidGenerator.class);\r
+ private static final Logger logger = LogManager.getLogger(UuidGenerator.class);\r
\r
private static int n = 100;\r
\r
/**\r
* Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
+ * European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
- * \r
+ *\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
package eu.etaxonomy.cdm.common;\r
\r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertTrue;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class XmlHelpTest {\r
- private static final Logger logger = Logger.getLogger(XmlHelpTest.class);\r
+ private static final Logger logger = LogManager.getLogger(XmlHelpTest.class);\r
\r
@BeforeClass\r
public static void setUpBeforeClass() throws Exception {\r
@After\r
public void tearDown() throws Exception {\r
}\r
- \r
+\r
/******* TESTS *************************************/\r
\r
@Test\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
-\r
package eu.etaxonomy.cdm.test.suite;\r
\r
-import org.apache.log4j.Logger;\r
import org.junit.runner.RunWith;\r
import org.junit.runners.Suite;\r
\r
}\r
)\r
public class CdmTestSuite {\r
- @SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmTestSuite.class);\r
\r
// the class remains completely empty,\r
// being used only as a holder for the above annotations\r
import org.apache.commons.lang.StringUtils;\r
import org.apache.http.NameValuePair;\r
import org.apache.http.message.BasicNameValuePair;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
\r
import com.ibm.lsid.MalformedLSIDException;\r
extends ServiceWrapperBase<Collection>\r
implements IBciServiceWrapper{\r
\r
- private static final Logger logger = Logger.getLogger(BciServiceWrapper.class);\r
+ private static final Logger logger = LogManager.getLogger(BciServiceWrapper.class);\r
\r
private enum ServiceType{\r
AUTHOR,\r
import java.io.InputStream;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public abstract class SchemaAdapterBase<T extends CdmBase> {\r
\r
- public static final Logger logger = Logger.getLogger(SchemaAdapterBase.class);\r
+ public static final Logger logger = LogManager.getLogger(SchemaAdapterBase.class);\r
\r
/**\r
* @return the identifier e.g. "info:srw/schema/1/dc-v1.1" for DublinCore\r
import org.apache.http.NameValuePair;\r
import org.apache.http.client.ClientProtocolException;\r
import org.apache.http.message.BasicNameValuePair;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.common.UriUtils;\r
*/\r
public class ServiceWrapperBase<T extends CdmBase> {\r
\r
- public static final Logger logger = Logger.getLogger(ServiceWrapperBase.class);\r
+ public static final Logger logger = LogManager.getLogger(ServiceWrapperBase.class);\r
\r
private URL baseUrl;\r
\r
import javax.persistence.EntityNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
public class EditGeoService implements IEditGeoService {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(EditGeoService.class);
+ private static final Logger logger = LogManager.getLogger(EditGeoService.class);
@Autowired
private IDescriptionDao dao;
\r
import org.apache.commons.collections.CollectionUtils;\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
import com.fasterxml.jackson.core.JsonParseException;\r
import com.fasterxml.jackson.databind.JsonMappingException;\r
* @since 17.11.2008\r
*/\r
public class EditGeoServiceUtilities {\r
- private static final Logger logger = Logger.getLogger(EditGeoServiceUtilities.class);\r
+ private static final Logger logger = LogManager.getLogger(EditGeoServiceUtilities.class);\r
\r
private static final int INT_MAX_LENGTH = String.valueOf(Integer.MAX_VALUE).length();\r
\r
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Namespace;
*/
public class GeoServiceArea {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(GeoServiceArea.class);
+ private static final Logger logger = LogManager.getLogger(GeoServiceArea.class);
private static final String VALUE = "value";
private static final String FIELD = "field";
import javax.xml.stream.XMLStreamException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class GeoServiceAreaAnnotatedMapping implements IGeoServiceAreaMapping {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(GeoServiceAreaAnnotatedMapping.class);
+ private static final Logger logger = LogManager.getLogger(GeoServiceAreaAnnotatedMapping.class);
@Autowired
private ITermService termService;
import java.util.Set;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import au.com.bytecode.opencsv.CSVReader;
import eu.etaxonomy.cdm.model.location.NamedArea;
*/
public class ShpAttributesToNamedAreaMapper {
- public static final Logger logger = Logger.getLogger(ShpAttributesToNamedAreaMapper.class);
+ public static final Logger logger = LogManager.getLogger(ShpAttributesToNamedAreaMapper.class);
private static final char COMMA = ',';
import javax.measure.UnitConverter;
import javax.measure.quantity.Length;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.geotools.data.DataUtilities;
import org.geotools.feature.SchemaException;
import org.geotools.feature.simple.SimpleFeatureBuilder;
/**
* See :
- *
+ *
* https://gis.stackexchange.com/questions/311272/create-dynamic-circle-polygon-from-specific-lat-long-using-geotools
* https://gis.stackexchange.com/questions/283183/using-geometricshapefactory-to-create-circle-with-radius-in-miles
- *
+ *
* https://stackoverflow.com/questions/36481651/how-do-i-create-a-circle-with-latitude-longitude-and-radius-with-geotools#36528805
- *
- *
+ *
+ *
* Another great library for creating shapes is https://github.com/locationtech/spatial4j
- *
+ *
* @author Andreas Kohlbecker
* @since Apr 21, 2020
*/
public class GeometryBuilder {
- private final static Logger logger = Logger.getLogger(GeometryBuilder.class);
+ private final static Logger logger = LogManager.getLogger(GeometryBuilder.class);
public enum CircleMethod {
circle, simpleCircleSmall, simpleCircle, reprojectedCircle;
/**
* Fails with javax.measure.IncommensurableException: m is not compatible with
* deg
- *
+ *
* see
* https://gis.stackexchange.com/questions/283183/using-geometricshapefactory-to-create-circle-with-radius-in-miles
- *
+ *
* @param radius
* @param latitude
* @param longitude
/**
* Only suitable for small radius (> 1000 m) as the circles are heavily
* distorted otherwise.
- *
+ *
* @param radius
* @param latitude
* @param longitude
/**
* Creates perfect circles which are looking good but might be projected
* incorrectly for the resulting map
- *
+ *
* @param distance
* @param latitude
* @param longitude
/**
* This Method should produces the best circles.
- *
+ *
* The code is based on an example published by Ian Turton on stackoverflow:
- *
+ *
* https://stackoverflow.com/questions/36481651/how-do-i-create-a-circle-with-latitude-longitude-and-radius-with-geotools#36528805
- *
+ *
* see https://gist.github.com/ianturton/973563fe5004985ba35a6e2247f7d823 and
* https://gitlab.com/snippets/17558
- *
+ *
* @param feature
* @param distance
* @return
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.geotools.feature.SchemaException;
import org.locationtech.jts.geom.Coordinate;
import org.opengis.feature.simple.SimpleFeature;
*/
public class KMLDocumentBuilder {
- private final static Logger logger = Logger.getLogger(KMLDocumentBuilder.class);
+ private final static Logger logger = LogManager.getLogger(KMLDocumentBuilder.class);
private Set<SpecimenOrObservationBase> occSet = new HashSet<>();
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
*/
@Component
public class IpniService implements IIpniService{
- private static final Logger logger = Logger.getLogger(IpniService.class);
+ private static final Logger logger = LogManager.getLogger(IpniService.class);
//TYPE
package eu.etaxonomy.cdm.ext.ipni;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
public class IpniServiceAuthorConfigurator extends IpniServiceConfiguratorBase implements IIpniServiceConfigurator {\r
- public static final Logger logger = Logger.getLogger(IpniServiceAuthorConfigurator.class);\r
- \r
+ public static final Logger logger = LogManager.getLogger(IpniServiceAuthorConfigurator.class);\r
+\r
}\r
*/\r
package eu.etaxonomy.cdm.ext.ipni;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* Configurator for IPNI name service import / mapping.\r
* @author a.mueller\r
*/\r
public class IpniServiceNamesConfigurator extends IpniServiceConfiguratorBase implements IIpniServiceConfigurator {\r
- public static final Logger logger = Logger.getLogger(IpniServiceNamesConfigurator.class);\r
+ public static final Logger logger = LogManager.getLogger(IpniServiceNamesConfigurator.class);\r
\r
//by default we do not include basionym import\r
boolean doBasionyms = false; //includes replaced synonyms\r
/**\r
- * \r
+ *\r
*/\r
package eu.etaxonomy.cdm.ext.ipni;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*\r
*/\r
public class IpniServicePublicationConfigurator extends IpniServiceConfiguratorBase implements IIpniServiceConfigurator{\r
- public static final Logger logger = Logger.getLogger(IpniServicePublicationConfigurator.class);\r
- \r
+ public static final Logger logger = LogManager.getLogger(IpniServicePublicationConfigurator.class);\r
+\r
/**\r
- * If true the abbreviation is used as title instead of the title \r
+ * If true the abbreviation is used as title instead of the title\r
*/\r
private boolean useAbbreviationAsTitle = false;\r
\r
- \r
- \r
+\r
+\r
public void setUseAbbreviationAsTitle(boolean useAbbreviationAsTitle) {\r
this.useAbbreviationAsTitle = useAbbreviationAsTitle;\r
}\r
\r
public boolean isUseAbbreviationAsTitle() {\r
return useAbbreviationAsTitle;\r
- } \r
- \r
+ }\r
+\r
}\r
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.api.service.media.MediaInfoFileReader;
*/
public class GbifJsonOccurrenceParser {
- private static final Logger logger = Logger.getLogger(GbifJsonOccurrenceParser.class);
+ private static final Logger logger = LogManager.getLogger(GbifJsonOccurrenceParser.class);
private static final String DATASET_KEY = "datasetKey";
private static final String DATASET_PROTOCOL = "protocol";
\r
import java.net.URISyntaxException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper.ReferenceType;\r
public class OpenUrlReference extends Reference {\r
\r
private static final long serialVersionUID = 5523159432429746682L;\r
- public static final Logger logger = Logger.getLogger(OpenUrlReference.class);\r
+ public static final Logger logger = LogManager.getLogger(OpenUrlReference.class);\r
\r
private static final String PAGETHUMB_BASE_URI = "http://www.biodiversitylibrary.org/pagethumb/";\r
\r
import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class ScratchpadsService {
- private static final Logger logger = Logger.getLogger(ScratchpadsService.class);
+ private static final Logger logger = LogManager.getLogger(ScratchpadsService.class);
public static final String SCRATCHPADS_JSON_ENDPOINT = "http://scratchpads.eu/explore/sites-list/json";
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
* @since 08.10.2008
*/
public class EditGeoServiceTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(EditGeoServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(EditGeoServiceTest.class);
private static final String EDIT_MAPSERVICE_URI_STING = "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php";
private static URI editMapServiceUri;
/**\r
* Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
-* \r
+*\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
import javax.xml.stream.XMLStreamException;\r
\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
-\r
-import org.apache.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
import org.junit.Test;\r
*\r
*/\r
public class GeoServiceAreaTest {\r
- private static final Logger logger = Logger.getLogger(GeoServiceAreaTest.class);\r
+ private static final Logger logger = LogManager.getLogger(GeoServiceAreaTest.class);\r
\r
/**\r
* @throws java.lang.Exception\r
public void setUp() throws Exception {\r
}\r
\r
-// ********************************** TESTS **************************************** \r
- \r
+// ********************************** TESTS ****************************************\r
+\r
/**\r
* Test method for {@link eu.etaxonomy.cdm.ext.geo.GeoServiceArea#add(java.lang.String, java.lang.String, java.lang.String)}.\r
*/\r
import java.io.InputStream;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@Ignore //preliminary
public class IpniServiceTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IpniServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(IpniServiceTest.class);
private IpniService service1;
private static boolean internetIsAvailable = true;
import static org.junit.Assert.assertTrue;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
import javax.xml.bind.Marshaller;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
public class KmlJaxbMarshallerTest {
-
- Kml kml;
-
- Logger logger;
-
+
+ private Kml kml;
+
+ private static final Logger logger = LogManager.getLogger(KmlJaxbMarshallerTest.class);
+
+
@Before
public void makeKML() {
FieldUnit fu = FieldUnit.NewInstance();
fu.setGatheringEvent(GatheringEvent.NewInstance());
fu.getGatheringEvent().setExactLocation(Point.NewInstance(-112.292238941097, 36.09520916122063, null, null));
-
+
KMLDocumentBuilder builder = new KMLDocumentBuilder();
builder.addSpecimenOrObservationBase(fu);
kml = builder.build();
-
- logger = Logger.getLogger(this.getClass());
- logger.setLevel(Level.DEBUG);
}
-
-
+
+
@Test
public void marshallTest() throws JAXBException, IOException {
import java.util.Set;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
import eu.etaxonomy.cdm.common.URI;
*/
public class BioCaseQueryServiceWrapperTest {
- public static final Logger logger = Logger.getLogger(BioCaseQueryServiceWrapperTest.class);
+ public static final Logger logger = LogManager.getLogger(BioCaseQueryServiceWrapperTest.class);
private static final int MAX_LINES_TO_READ = 1000;
private static final int TIMEOUT = 60000;
import java.net.URISyntaxException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
*/
public class MobotOpenUrlServiceWrapperTest {
- public static final Logger logger = Logger.getLogger(MobotOpenUrlServiceWrapperTest.class);
+ public static final Logger logger = LogManager.getLogger(MobotOpenUrlServiceWrapperTest.class);
public static final String baseUrl = "http://www.biodiversitylibrary.org/openurl";
private MobotOpenUrlServiceWrapper openUrlServiceWrapper;
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
*\r
*/\r
public class SruServiceWrapperTest {\r
- public static final Logger logger = Logger.getLogger(SruServiceWrapperTest.class);\r
+ public static final Logger logger = LogManager.getLogger(SruServiceWrapperTest.class);\r
\r
private static final String baseUrl = "http://gso.gbv.de/sru/DB=1.83/";\r
\r
/**\r
* Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
+ * European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
- * \r
+ *\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
package eu.etaxonomy.cdm.test.suite;\r
\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.junit.runner.RunWith;\r
import org.junit.runners.Suite;\r
-import org.apache.log4j.Logger;\r
\r
\r
@RunWith(Suite.class)\r
-@Suite.SuiteClasses( \r
- { \r
+@Suite.SuiteClasses(\r
+ {\r
// TaxonServiceImplTest.class\r
//,CreateDataTest.class\r
}\r
)\r
public class CdmTestSuite {\r
- static Logger logger = Logger.getLogger(CdmTestSuite.class);\r
+ static Logger logger = LogManager.getLogger(CdmTestSuite.class);\r
\r
- // the class remains completely empty, \r
+ // the class remains completely empty,\r
// being used only as a holder for the above annotations\r
\r
//console test //TODO test\r
*/\r
package eu.etaxonomy.cdm.io.api.application;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.core.io.ClassPathResource;\r
import org.springframework.core.io.Resource;\r
\r
public class CdmIoApplicationController extends CdmApplicationController {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmIoApplicationController.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmIoApplicationController.class);\r
\r
\r
public static final String DEFAULT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultIoApplicationContext.xml";\r
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.ResultWrapper;\r
import eu.etaxonomy.cdm.model.common.Language;\r
* @since 20.03.2008\r
*/\r
public class BerlinModelTransformer {\r
- private static final Logger logger = Logger.getLogger(BerlinModelTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(BerlinModelTransformer.class);\r
\r
//source Refs\r
public static final UUID uuidSourceRefEuroMed = UUID.fromString("0603a84a-f024-4454-ab92-9e2ac0139126");\r
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
extends Cdm2CdmImportBase {
private static final long serialVersionUID = -2111102574346601573L;
- private static final Logger logger = Logger.getLogger(Cdm2CdmDescriptionImport.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2CdmDescriptionImport.class);
@Override
protected void doInvoke(Cdm2CdmImportState state) {
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
extends CdmImportBase<Cdm2CdmImportConfigurator, Cdm2CdmImportState> {
private static final long serialVersionUID = 1344722304369624443L;
- private static final Logger logger = Logger.getLogger(Cdm2CdmImportBase.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2CdmImportBase.class);
//quick and dirty
private Cdm2CdmImportState stateX;
*/
package eu.etaxonomy.cdm.io.cdm2cdm;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
extends Cdm2CdmImportBase {
private static final long serialVersionUID = -2111102574346601573L;
- private static final Logger logger = Logger.getLogger(Cdm2CdmTaxonNodeImport.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2CdmTaxonNodeImport.class);
@Override
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
extends Cdm2CdmImportBase {
private static final long serialVersionUID = 3995116783196060465L;
- private static final Logger logger = Logger.getLogger(Cdm2CdmVocabularyImport.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2CdmVocabularyImport.class);
@Override
protected void doInvoke(Cdm2CdmImportState state) {
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.BeansException;\r
import org.springframework.context.ApplicationContext;\r
import org.springframework.context.ApplicationContextAware;\r
public class CdmApplicationAwareDefaultExport<T extends IExportConfigurator>\r
implements ICdmExporter<T>, ApplicationContextAware {\r
\r
- private static final Logger logger = Logger.getLogger(CdmApplicationAwareDefaultExport.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmApplicationAwareDefaultExport.class);\r
\r
protected ApplicationContext applicationContext;\r
\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.BeansException;\r
import org.springframework.context.ApplicationContext;\r
import org.springframework.context.ApplicationContextAware;\r
*/\r
@Component("defaultImport")\r
public class CdmApplicationAwareDefaultImport<T extends IImportConfigurator> implements ICdmImporter<T>, ApplicationContextAware {\r
- private static final Logger logger = Logger.getLogger(CdmApplicationAwareDefaultImport.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmApplicationAwareDefaultImport.class);\r
\r
protected ApplicationContext applicationContext;\r
\r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
\r
extends CdmDefaultIOBase<IExportConfigurator>\r
implements ICdmExporter<T> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmDefaultExport.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDefaultExport.class);\r
\r
@Override\r
public ExportResult invoke(T config){\r
*/\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.core.io.ClassPathResource;\r
\r
import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
public class CdmDefaultIOBase<T extends IIoConfigurator> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmDefaultIOBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDefaultIOBase.class);\r
\r
public static final String DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE = CdmIoApplicationController.DEFAULT_APPLICATION_CONTEXT_RESOURCE;\r
\r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
\r
*/\r
public class CdmDefaultImport<T extends IImportConfigurator> extends CdmDefaultIOBase<IImportConfigurator> implements ICdmImporter<T> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmDefaultImport.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDefaultImport.class);\r
\r
@Override\r
public ImportResult invoke(T config){\r
import java.io.ByteArrayOutputStream;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
\r
private static final long serialVersionUID = 3685030095117254235L;\r
\r
- private static Logger logger = Logger.getLogger(CdmExportBase.class);\r
+ private static Logger logger = LogManager.getLogger(CdmExportBase.class);\r
\r
protected ByteArrayOutputStream exportStream;\r
\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
import eu.etaxonomy.cdm.api.service.pager.Pager;
implements ICdmImport<CONFIG, STATE>{
private static final long serialVersionUID = 8730012744209195616L;
- private static final Logger logger = Logger.getLogger(CdmImportBase.class);
+ private static final Logger logger = LogManager.getLogger(CdmImportBase.class);
protected static final boolean CREATE = true;
protected static final boolean IMAGE_GALLERY = true;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
implements ICdmIO<STATE>, IIoObservable {
private static final long serialVersionUID = -2216451655392574659L;
- private static final Logger logger = Logger.getLogger(CdmIoBase.class);
+ private static final Logger logger = LogManager.getLogger(CdmIoBase.class);
private final Set<IIoObserver> observers = new HashSet<>();
protected String ioName = null;
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportConfiguratorBase.IdType;\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
extends CdmExportBase<CONFIG, STATE, TRANSFORM, Source> {\r
\r
private static final long serialVersionUID = -1652695446752713850L;\r
- private static Logger logger = Logger.getLogger(DbExportBase.class);\r
+ private static Logger logger = LogManager.getLogger(DbExportBase.class);\r
\r
protected boolean checkSqlServerColumnExists(Source source, String tableName, String columnName){\r
String strQuery = "SELECT Count(t.id) as n " +\r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
\r
private static final long serialVersionUID = 3776529518379378810L;\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(DbExportConfiguratorBase.class);\r
+ private static Logger logger = LogManager.getLogger(DbExportConfiguratorBase.class);\r
\r
\r
public enum IdType{\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public abstract class DbExportStateBase<CONFIG extends DbExportConfiguratorBase<? extends DbExportStateBase<CONFIG, TRANSFORM>, TRANSFORM, Source>, TRANSFORM extends IExportTransformer>\r
extends ExportStateBase<CONFIG, TRANSFORM, Source> {\r
\r
- private static final Logger logger = Logger.getLogger(DbExportStateBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbExportStateBase.class);\r
\r
protected Map<UUID, Integer> dbIdMap = new HashMap<UUID, Integer>();\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
implements ICdmIO<STATE>, IPartitionedIO<STATE> {\r
\r
private static final long serialVersionUID = 5539446566014467398L;\r
- private static final Logger logger = Logger.getLogger(DbImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportBase.class);\r
\r
private String dbTableName ;\r
private String pluralString;\r
import java.lang.reflect.Method;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
\r
private static final long serialVersionUID = 3474072167155099394L;\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(DbImportConfiguratorBase.class);\r
+ private static Logger logger = LogManager.getLogger(DbImportConfiguratorBase.class);\r
\r
private Method userTransformationMethod;\r
\r
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.model.common.CdmBase;
implements IPartitionedState {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbImportStateBase.class);
+ private static final Logger logger = LogManager.getLogger(DbImportStateBase.class);
public static final String CURRENT_OBJECT_NAMESPACE = "CurrentObjectNamespace";
public static final String CURRENT_OBJECT_ID = "CurrentObjectId";
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
\r
*/\r
public class DefaultImportState<CONFIG extends ImportConfiguratorBase> extends ImportStateBase<CONFIG, CdmImportBase> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DefaultImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(DefaultImportState.class);\r
/**\r
* @param config\r
*/\r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.application.ICdmRepository;\r
\r
private static final long serialVersionUID = -6361253919270760156L;\r
\r
- private static final Logger logger = Logger.getLogger(ExportConfiguratorBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExportConfiguratorBase.class);\r
\r
private CHECK check = CHECK.EXPORT_WITHOUT_CHECK;\r
\r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
\r
extends IoStateBase<CONFIG, CdmExportBase, ExportResult> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ExportStateBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExportStateBase.class);\r
\r
protected ExportStateBase(CONFIG config){\r
this.config = config;\r
import java.util.Set;\r
import java.util.Stack;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.xml.sax.Attributes;\r
import org.xml.sax.Locator;\r
import org.xml.sax.SAXException;\r
*\r
*/\r
public class ImportHandlerBase extends DefaultHandler2 {\r
- private static final Logger logger = Logger.getLogger(ImportHandlerBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ImportHandlerBase.class);\r
\r
private Set<IIoObserver> observers = new HashSet<IIoObserver>();\r
\r
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
*\r
*/\r
public class ImportHelper {\r
- private static final Logger logger = Logger.getLogger(ImportHelper.class);\r
+ private static final Logger logger = LogManager.getLogger(ImportHelper.class);\r
\r
public static final boolean OVERWRITE = true;\r
public static final boolean NO_OVERWRITE = false;\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.IService;\r
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
extends IoStateBase<CONFIG, IO, ImportResult> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ImportStateBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ImportStateBase.class);\r
\r
private boolean success = true;\r
\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator;\r
* @version 1.0\r
*/\r
public class ImportWrapper {\r
- private static final Logger logger = Logger.getLogger(ImportWrapper.class);\r
+ private static final Logger logger = LogManager.getLogger(ImportWrapper.class);\r
\r
private String label;\r
\r
*/\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;\r
\r
import eu.etaxonomy.cdm.api.application.ICdmRepository;\r
private static final long serialVersionUID = -2254648962451309933L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(IoConfiguratorBase.class);\r
+ private static final Logger logger = LogManager.getLogger(IoConfiguratorBase.class);\r
\r
public static final boolean NO_UNPUBLISHED = DaoBase.NO_UNPUBLISHED;\r
public static final boolean INCLUDE_UNPUBLISHED = DaoBase.INCLUDE_UNPUBLISHED;\r
*/\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.IoResultBase;\r
\r
extends IIoConfigurator, IO extends ICdmIO, RESULT extends IoResultBase> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(IoStateBase.class);\r
+ private static final Logger logger = LogManager.getLogger(IoStateBase.class);\r
\r
private IO currentIO;\r
\r
import java.util.UUID;\r
\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.IService;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*\r
*/\r
public class MapWrapper<T extends CdmBase> {\r
- private static Logger logger = Logger.getLogger(MapWrapper.class);\r
+ private static Logger logger = LogManager.getLogger(MapWrapper.class);\r
\r
private Map internalMap;\r
private IService<CdmBase> service = null; \r
\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Duration;\r
import org.joda.time.ReadableDuration;\r
* @version 1.0\r
*/\r
public class PartitionerProfiler {\r
- private static final Logger logger = Logger.getLogger(PartitionerProfiler.class);\r
+ private static final Logger logger = LogManager.getLogger(PartitionerProfiler.class);\r
\r
ResultSetPartitioner partitioner;\r
\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
\r
*/\r
public class RelatedObjectsHelper {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(RelatedObjectsHelper.class);\r
+ private static final Logger logger = LogManager.getLogger(RelatedObjectsHelper.class);\r
\r
private Map<Object, Map<String, ? extends CdmBase>> relatedObjects;\r
\r
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.common.CdmUtils;
* @since 16.02.2010
*/
public class ResultSetPartitioner<STATE extends IPartitionedState> {
- private static final Logger logger = Logger.getLogger(ResultSetPartitioner.class);
+ private static final Logger logger = LogManager.getLogger(ResultSetPartitioner.class);
private final PartitionerProfiler profiler = new PartitionerProfiler();
//************************* STATIC ***************************************************/
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* Some ResultSets do not allow asking twice for the same column value. This proxy solves this\r
*/\r
public class ResultSetProxy implements ResultSet {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ResultSetProxy.class);\r
+ private static final Logger logger = LogManager.getLogger(ResultSetProxy.class);\r
\r
// ************************** FACTORY METHODS *********************************/\r
\r
import java.sql.Statement;
import org.apache.http.MethodNotSupportedException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.database.update.DatabaseTypeNotSupportedException;
* @author Andreas Müller
*/
public class Source {
- static Logger logger = Logger.getLogger(Source.class);
+ static Logger logger = LogManager.getLogger(Source.class);
/* ************ Constants **************************************/
//Mode
import java.util.LinkedList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
implements ITaxonNodeOutStreamPartitioner {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNodeOutStreamPartitioner.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeOutStreamPartitioner.class);
private static final List<String> defaultPropertyPaths = Arrays.asList(new String[]{"taxon","taxon.name"});
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
public class TaxonNodeOutStreamPartitionerConcurrent implements ITaxonNodeOutStreamPartitioner {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNodeOutStreamPartitionerConcurrent.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeOutStreamPartitionerConcurrent.class);
//*********************** VARIABLES *************************************************/
*/\r
package eu.etaxonomy.cdm.io.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.location.NamedArea;\r
\r
@Deprecated\r
public class TdwgAreaProvider {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TdwgAreaProvider.class);\r
+ private static final Logger logger = LogManager.getLogger(TdwgAreaProvider.class);\r
\r
\r
//************************** METHODS ********************************\r
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
private static final long serialVersionUID = 6078292713506530756L;
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(XmlExportConfiguratorBase.class);
+ private static Logger logger = LogManager.getLogger(XmlExportConfiguratorBase.class);
public enum IdType{
CDM_ID,
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class XmlExportState<CONFIG extends XmlExportConfiguratorBase<?>>\r
extends ExportStateBase<CONFIG, IExportTransformer, File> {\r
\r
- private static final Logger logger = Logger.getLogger(XmlExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(XmlExportState.class);\r
\r
private Map<UUID, String> xmlIdMap = new HashMap<>();\r
\r
import javax.xml.stream.XMLStreamException;\r
import javax.xml.stream.events.XMLEvent;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.xml.sax.SAXException;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
private static final long serialVersionUID = 1505202381104645545L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(XmlImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(XmlImportBase.class);\r
\r
protected void fireSchemaConflictEventExpectedStartTag(String elName, XMLEventReader reader) throws XMLStreamException {\r
String type = "ElementStart";\r
\r
import javax.xml.stream.XMLEventReader;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public class XmlImportState<CONFIG extends XmlImportConfiguratorBase, IO extends XmlImportBase> extends ImportStateBase<CONFIG, IO> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(XmlImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(XmlImportState.class);\r
\r
private XMLEventReader reader;\r
\r
*/\r
package eu.etaxonomy.cdm.io.common.events;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.events.IIoEvent;\r
import eu.etaxonomy.cdm.io.common.events.IIoObserver;\r
*\r
*/\r
public class LoggingIoObserver implements IIoObserver {\r
- private static final Logger logger = Logger.getLogger(LoggingIoObserver.class);\r
+ private static final Logger logger = LogManager.getLogger(LoggingIoObserver.class);\r
\r
/* (non-Javadoc)\r
* @see eu.etaxonomy.cdm.io.common.IIoObserver#handleEvent(eu.etaxonomy.cdm.io.common.IIoEvent)\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
\r
*/\r
public abstract class CdmAttributeMapperBase extends CdmMapperBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmAttributeMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmAttributeMapperBase.class);\r
\r
public abstract Set<String> getSourceAttributes();\r
\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.out.ObjectChangeMapper;\r
\r
*/\r
public class CdmIoMapping {\r
\r
- private static final Logger logger = Logger.getLogger(CdmIoMapping.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmIoMapping.class);\r
\r
//protected List<CdmAttributeMapperBase> mapperList = new ArrayList<>();\r
protected List<CdmMapperBase> mapperList = new ArrayList<>();\r
\r
package eu.etaxonomy.cdm.io.common.mapping;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* The most general mapper class for all cdm mappers.\r
*/\r
public abstract class CdmMapperBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmMapperBase.class);\r
\r
}
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* Mapper base class mapping a single source attribute to a single destination attribute.\r
public abstract class CdmSingleAttributeMapperBase extends CdmAttributeMapperBase{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmSingleAttributeMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmSingleAttributeMapperBase.class);\r
\r
private String sourceValue;\r
private String destinationValue;\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class DbIgnoreMapper\r
extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase> {\r
\r
- private static final Logger logger = Logger.getLogger(DbIgnoreMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbIgnoreMapper.class);\r
\r
//*************************** FACTORY ***************************************************************//\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
* @since 11.03.2010\r
*/\r
public class DbImportAnnotationCreationMapper extends DbImportSupplementCreationMapperBase<Annotation, AnnotatableEntity, DbImportStateBase<?, ?>, AnnotationType> {\r
- private static final Logger logger = Logger.getLogger(DbImportAnnotationCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportAnnotationCreationMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
public class DbImportAnnotationMapper\r
extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, AnnotatableEntity>{\r
\r
- private static final Logger logger = Logger.getLogger(DbImportAnnotationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportAnnotationMapper.class);\r
\r
private MarkerType ifNullMarkerType;\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
*/\r
public class DbImportCommonNameCreationMapper<STATE extends DbImportStateBase<?,?>> extends DbImportDescriptionElementCreationMapperBase<CommonTaxonName, DbImportStateBase<?,?>> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportCommonNameCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportCommonNameCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
public abstract class DbImportDefinedTermCreationMapperBase<TERM extends DefinedTermBase, TERMED extends VersionableEntity, STATE extends DbImportStateBase<?,?>>\r
extends DbImportObjectCreationMapperBase<TERMED, STATE> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportDefinedTermCreationMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportDefinedTermCreationMapperBase.class);\r
\r
//******************************* ATTRIBUTES ***************************************/\r
protected String dbTermAttribute;\r
import java.util.Set;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public abstract class DbImportDescriptionElementCreationMapperBase<ELEMENT extends DescriptionElementBase, STATE extends DbImportStateBase<?,?>> extends DbImportObjectCreationMapperBase<ELEMENT, STATE> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportDescriptionElementCreationMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportDescriptionElementCreationMapperBase.class);\r
\r
//******************************* ATTRIBUTES ***************************************/\r
\r
import java.sql.SQLException;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbImportStateBase;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
*/
public class DbImportDescriptionElementSourceCreationMapper extends DbImportObjectCreationMapperBase<DescriptionElementSource, DbImportStateBase<?,?>> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbImportDescriptionElementSourceCreationMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbImportDescriptionElementSourceCreationMapper.class);
//**************************** FACTORY METHOD ***********************************************/
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.description.Distribution;\r
extends DbImportDescriptionElementCreationMapperBase<Distribution, DbImportStateBase<?,?>> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportDistributionCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportDistributionCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
package eu.etaxonomy.cdm.io.common.mapping;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.DOI;
import eu.etaxonomy.cdm.io.common.DbImportStateBase;
public class DbImportDoiMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbImportDoiMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbImportDoiMapper.class);
public static DbImportDoiMapper NewInstance (String dbAttributeString, String cdmAttributeString) {
boolean obligatory = false;
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.Extension;\r
* @version 1.0\r
*/\r
public class DbImportExtensionCreationMapper extends DbImportSupplementCreationMapperBase<Extension, IdentifiableEntity, DbImportStateBase<?, ?>, ExtensionType > {\r
- private static final Logger logger = Logger.getLogger(DbImportExtensionCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportExtensionCreationMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, IdentifiableEntity>\r
implements IDbImportMapper<DbImportStateBase<?,?>,IdentifiableEntity>{\r
\r
- private static final Logger logger = Logger.getLogger(DbImportExtensionMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportExtensionMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.ExtensionType;\r
public class DbImportExtensionTypeCreationMapper<STATE extends DbImportStateBase<?,?>>\r
extends DbImportDefinedTermCreationMapperBase<ExtensionType, IdentifiableEntity, DbImportStateBase<?,?>> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportExtensionTypeCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportExtensionTypeCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
extends DbImportDefinedTermCreationMapperBase<Feature, DescriptionElementBase, DbImportStateBase<?,?>> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportFeatureCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportFeatureCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.SQLException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class DbImportImageCreationMapper extends DbImportDescriptionElementCreationMapperBase<TextData, DbImportStateBase<?,?>> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportImageCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportImageCreationMapper.class);\r
\r
// ************************** FACTORY ***********************************************************/\r
\r
import java.util.Set;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
import eu.etaxonomy.cdm.common.URI;\r
* @since 12.05.2009\r
*/\r
public class DbImportImageGalleryMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, Taxon> implements IDbImportMapper<DbImportStateBase<?,?>,Taxon>{\r
- private static final Logger logger = Logger.getLogger(DbImportImageGalleryMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportImageGalleryMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
\r
package eu.etaxonomy.cdm.io.common.mapping;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import com.ibm.lsid.MalformedLSIDException;\r
\r
public class DbImportLsidMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportLsidMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportLsidMapper.class);\r
\r
public static DbImportLsidMapper NewInstance (String dbAttributeString, String cdmAttributeString) {\r
boolean obligatory = false;\r
\r
package eu.etaxonomy.cdm.io.common.mapping;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class DbImportMapperBase<STATE extends DbImportStateBase<?,?>> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMapperBase.class);\r
\r
private STATE state;\r
private String tableName;\r
import java.sql.SQLException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
public class DbImportMapping<STATE extends DbImportStateBase, CONFIG extends IImportConfigurator>\r
extends CdmIoMapping {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportMapping.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMapping.class);\r
\r
private boolean isInitialized = false;\r
private Class<? extends CdmBase> destinationClass;\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
* @version 1.0\r
*/\r
public class DbImportMarkerCreationMapper extends DbImportSupplementCreationMapperBase<Marker, AnnotatableEntity, DbImportStateBase<?, ?>, MarkerType> {\r
- private static final Logger logger = Logger.getLogger(DbImportMarkerCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMarkerCreationMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
* @version 1.0\r
*/\r
public class DbImportMarkerMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, AnnotatableEntity> implements IDbImportMapper<DbImportStateBase<?,?>,AnnotatableEntity>{\r
- private static final Logger logger = Logger.getLogger(DbImportMarkerMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMarkerMapper.class);\r
\r
//************************** FACTORY METHODS ***************************************************************/\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
* @since 12.03.2010\r
*/\r
public class DbImportMediaMapper extends DbImportMultiAttributeMapperBase<DescriptionElementBase, DbImportStateBase<?,?>> {\r
- private static final Logger logger = Logger.getLogger(DbImportMediaMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMediaMapper.class);\r
\r
//********************************** FACTORY ***************************************\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
*/\r
//TODO remove ANNOTATABLE by ISourcable (but this is not CDMBase yet therefore not trivial\r
public class DbImportMethodMapper<CDMBASE extends VersionableEntity, STATE extends DbImportStateBase<?,?>> extends DbImportMultiAttributeMapperBase<CDMBASE, STATE> {\r
- private static final Logger logger = Logger.getLogger(DbImportMethodMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMethodMapper.class);\r
\r
//******************************* ATTRIBUTES ***************************************/\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public abstract class DbImportMultiAttributeMapperBase<CDMBASE extends CdmBase, STATE extends DbImportStateBase<?,?>> extends MultipleAttributeMapperBase<CdmSingleAttributeMapperBase> implements IDbImportMapper<STATE, CDMBASE>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportMultiAttributeMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMultiAttributeMapperBase.class);\r
\r
//**************************** ATTRIBUTES ****************************************************\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.io.common.ImportHelper;\r
extends DbImportMultiAttributeMapperBase<CDMBASE, DbImportStateBase<?,?>> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportMultiLanguageTextMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportMultiLanguageTextMapper.class);\r
\r
//****************************** FACTORY METHOD ********************************************/\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
* @param <STATE>\r
*/\r
public class DbImportNameTypeDesignationMapper<STATE extends DbImportStateBase<?,?>, T extends IDbImportTransformed> extends DbImportMultiAttributeMapperBase<CdmBase, STATE> {\r
- private static final Logger logger = Logger.getLogger(DbImportNameTypeDesignationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportNameTypeDesignationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
*/\r
public class DbImportObjectCreationMapper<ANNOTATABLE extends AnnotatableEntity, STATE extends DbImportStateBase<?,?>> extends DbImportObjectCreationMapperBase<ANNOTATABLE, STATE> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportObjectCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportObjectCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
public abstract class DbImportObjectCreationMapperBase<CREATE extends VersionableEntity, STATE extends DbImportStateBase<?,?>>\r
extends DbImportMultiAttributeMapperBase<CREATE, STATE> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportObjectCreationMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportObjectCreationMapperBase.class);\r
\r
//******************************* ATTRIBUTES ***************************************/\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.io.common.ImportHelper;\r
*/\r
public class DbImportObjectMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportObjectMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportObjectMapper.class);\r
\r
String relatedObjectNamespace;\r
\r
package eu.etaxonomy.cdm.io.common.mapping;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class DbImportStringMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportStringMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportStringMapper.class);\r
\r
public static DbImportStringMapper NewInstance (String dbAttributeString, String cdmAttributeString) {\r
boolean obligatory = false;\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
*/\r
public abstract class DbImportSupplementCreationMapperBase<SUPPLEMENT extends VersionableEntity, SUPPLEMENTABLE extends AnnotatableEntity, STATE extends DbImportStateBase<?,?>, TYPE extends DefinedTermBase> extends DbImportObjectCreationMapperBase<SUPPLEMENT, STATE> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportSupplementCreationMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportSupplementCreationMapperBase.class);\r
\r
\r
//******************************* ATTRIBUTES ***************************************/\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.io.common.ICdmIO;\r
public class DbImportSynonymMapper<STATE extends DbImportStateBase<?,?>>\r
extends DbImportMultiAttributeMapperBase<CdmBase, STATE> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportSynonymMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportSynonymMapper.class);\r
\r
//******************************* ATTRIBUTES ***************************************/\r
\r
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.IClassificationService;\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
public class DbImportTaxIncludedInMapper<STATE extends DbImportStateBase<DbImportConfiguratorBase<STATE>,?>>\r
extends DbImportMultiAttributeMapperBase<CdmBase, STATE> {\r
\r
- private static final Logger logger = Logger.getLogger(DbImportTaxIncludedInMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportTaxIncludedInMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.Language;\r
extends DbImportDescriptionElementCreationMapperBase<TextData, DbImportStateBase<?,?>> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportTextDataCreationMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportTextDataCreationMapper.class);\r
\r
//******************************** FACTORY METHOD ***************************************************/\r
\r
package eu.etaxonomy.cdm.io.common.mapping;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbImportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
public class DbImportTimePeriodMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbImportTimePeriodMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbImportTimePeriodMapper.class);
boolean isVerbatim = false;
import java.lang.reflect.Method;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.io.common.ImportHelper;\r
public class DbImportTruncatedStringMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportTruncatedStringMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportTruncatedStringMapper.class);\r
\r
\r
private String longTextAttribute;\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class DbImportUuidMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbImportUuidMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbImportUuidMapper.class);\r
\r
/**\r
* @param dbAttributString\r
import java.sql.SQLException;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
* @since 25.02.2010\r
*/\r
public class DbNotYetImplementedMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, CdmBase> {\r
- private static final Logger logger = Logger.getLogger(DbNotYetImplementedMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbNotYetImplementedMapper.class);\r
\r
public static DbNotYetImplementedMapper NewInstance(String dbAttributeToIgnore){\r
return new DbNotYetImplementedMapper(dbAttributeToIgnore, null, null, null);\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.update.DatabaseTypeNotSupportedException;\r
import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
* @since 12.05.2009\r
*/\r
public abstract class DbSingleAttributeImportMapperBase<STATE extends DbImportStateBase<?,?>, CDM_BASE extends CdmBase> extends CdmSingleAttributeMapperBase implements IDbImportMapper<STATE, CDM_BASE> {\r
- private static final Logger logger = Logger.getLogger(DbSingleAttributeImportMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbSingleAttributeImportMapperBase.class);\r
\r
protected DbImportMapperBase<STATE> importMapperHelper = new DbImportMapperBase<>();\r
// private Integer precision = null;\r
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.common.DbImportStateBase;
public class InputTransformerBase implements IInputTransformer, Serializable {
private static final long serialVersionUID = 1824180329524647957L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(InputTransformerBase.class);
+ private static final Logger logger = LogManager.getLogger(InputTransformerBase.class);
@Override
public Feature getFeatureByKey(String key) throws UndefinedTransformerMethodException {
import java.util.Set;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public abstract class MultipleAttributeMapperBase<SINGLE_MAPPER extends CdmSingleAttributeMapperBase> extends CdmAttributeMapperBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MultipleAttributeMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(MultipleAttributeMapperBase.class);\r
\r
\r
//******************************* ATTRIBUTES ***************************************/\r
\r
package eu.etaxonomy.cdm.io.common.mapping;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
public class UndefinedTransformerMethodException extends Exception {\r
private static final long serialVersionUID = -700625202290836090L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(UndefinedTransformerMethodException.class);\r
+ private static final Logger logger = LogManager.getLogger(UndefinedTransformerMethodException.class);\r
\r
public UndefinedTransformerMethodException(String message){\r
super(message);\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
import eu.etaxonomy.cdm.io.common.mapping.MultipleAttributeMapperBase;\r
*/\r
public class CdmOneToManyMapper<ONE extends CdmBase, MANY extends CdmBase, SINGLE_MAPPER extends CdmSingleAttributeMapperBase> extends MultipleAttributeMapperBase<SINGLE_MAPPER> {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(CdmOneToManyMapper.class);\r
+ private static Logger logger = LogManager.getLogger(CdmOneToManyMapper.class);\r
\r
private Class<MANY> manyClass;\r
private Class<ONE> oneClass;\r
\r
package eu.etaxonomy.cdm.io.common.mapping.berlinModel;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
\r
*/\r
public class CdmStringMapper extends CdmSingleAttributeMapperBase {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(CdmStringMapper.class);\r
+ private static Logger logger = LogManager.getLogger(CdmStringMapper.class);\r
\r
/**\r
* @param dbValue\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportConfiguratorBase;\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
public class CdmDbExportMapping<STATE extends DbExportStateBase<CONFIG, TRANSFORM>, CONFIG extends DbExportConfiguratorBase<STATE, TRANSFORM, Source>, TRANSFORM extends IExportTransformer>\r
extends CdmIoMapping {\r
\r
- private static final Logger logger = Logger.getLogger(CdmDbExportMapping.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDbExportMapping.class);\r
\r
private PreparedStatement preparedStatement;\r
private String dbTableName;\r
import java.util.Collection;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportConfiguratorBase;\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
public class CollectionExportMapping<STATE extends DbExportStateBase<CONFIG, TRANSFORM>, CONFIG extends DbExportConfiguratorBase<STATE, TRANSFORM, Source>, TRANSFORM extends IExportTransformer>\r
extends CdmDbExportMapping<STATE, CONFIG, TRANSFORM> {\r
\r
- private static final Logger logger = Logger.getLogger(CollectionExportMapping.class);\r
+ private static final Logger logger = LogManager.getLogger(CollectionExportMapping.class);\r
\r
private IdMapper parentMapper;\r
private DbSequenceMapper sequenceMapper;\r
import java.sql.PreparedStatement;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
*/\r
public class CreatedAndNotesMapper extends MultipleAttributeMapperBase<DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CreatedAndNotesMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(CreatedAndNotesMapper.class);\r
\r
public static CreatedAndNotesMapper NewInstance(){\r
return new CreatedAndNotesMapper(true);\r
import java.util.HashSet;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbAnnotationMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbAnnotationMapper.class);
private final String annotationPrefix;
private String separator = ";";
import java.lang.reflect.Method;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
* @since 06.02.2012
*/
public class DbAreaMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
- private static final Logger logger = Logger.getLogger(DbAreaMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbAreaMapper.class);
private Method method;
private boolean isCache;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
implements IDbExportMapper {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbBooleanMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbBooleanMapper.class);
public static DbBooleanMapper NewInstance(String cdmAttributeString, String dbAttributeString){
return new DbBooleanMapper(cdmAttributeString, dbAttributeString, null, false);
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
*/
public class DbClobMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbClobMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbClobMapper.class);
public static DbClobMapper NewInstance(String cdmAttributeString, String dbAttributeString){
return new DbClobMapper(cdmAttributeString, dbAttributeString, null);
\r
package eu.etaxonomy.cdm.io.common.mapping.out;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbConstantMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbConstantMapper.class);\r
\r
private int sqlType;\r
private Object value;\r
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
/**
public class DbDateMapper extends DbSingleAttributeExportMapperBase implements IDbExportMapper {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbStringMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbStringMapper.class);
public static DbDateMapper NewInstance(String cdmAttributeString, String dbAttributeString){
return new DbDateMapper(cdmAttributeString, dbAttributeString, null);
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DbDescriptionElementTaxonMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbDescriptionElementTaxonMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbDescriptionElementTaxonMapper.class);
private boolean isCache = false;
private boolean cacheIsNameTitleCache = false;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
*/
public class DbDistributionStatusMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbDistributionStatusMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbDistributionStatusMapper.class);
private boolean isCache = false;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.DOI;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
public class DbDoiMapper
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {
- private static final Logger logger = Logger.getLogger(DbDoiMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbDoiMapper.class);
private static final int MAX_PRECISION = -1; //precision for datatype nvarchar(max) == clob (SQL Server 2008)
import java.sql.SQLException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class DbExportIgnoreMapper\r
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {\r
\r
- private static final Logger logger = Logger.getLogger(DbExportIgnoreMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbExportIgnoreMapper.class);\r
\r
public static DbExportIgnoreMapper NewInstance(String dbAttributeToIgnore){\r
return new DbExportIgnoreMapper(null, dbAttributeToIgnore, null, null);\r
\r
import java.sql.PreparedStatement;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
\r
*/\r
public class DbExportMapperBase<STATE extends DbExportStateBase<?, IExportTransformer>> /*implements IDbExportMapper */{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbExportMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbExportMapperBase.class);\r
\r
protected PreparedStatement preparedStatement = null;\r
protected int index = 0;\r
package eu.etaxonomy.cdm.io.common.mapping.out;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* This mapper does not change any import object, but keeps the information that a database\r
public class DbExportNotYetImplementedMapper\r
extends DbExportIgnoreMapper {\r
\r
- private static final Logger logger = Logger.getLogger(DbExportNotYetImplementedMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbExportNotYetImplementedMapper.class);\r
\r
public static DbExportNotYetImplementedMapper NewInstance(String dbAttributeToIgnore){\r
return new DbExportNotYetImplementedMapper(null, dbAttributeToIgnore, null, null);\r
import java.sql.Types;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
* @since 12.05.2009
*/
public class DbExtensionMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
- private static final Logger logger = Logger.getLogger(DbExtensionMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbExtensionMapper.class);
private final ExtensionType extensionType;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbFixedIntegerMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbFixedIntegerMapper.class);
private Integer fixInteger;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>
implements IDbExportMapper<DbExportStateBase<?,IExportTransformer>, IExportTransformer> {
- private static final Logger logger = Logger.getLogger(DbFixedStringMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbFixedStringMapper.class);
private static final int MAX_PRECISION = -1; //precision for datatype nvarchar(max) == clob (SQL Server 2008)
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbImageMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbImageMapper.class);
public static DbImageMapper NewInstance(String dbAttributeString){
return new DbImageMapper(dbAttributeString, null);
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.CdmBase;
* @since 10.06.2009
*/
public class DbIntegerAnnotationMapper extends DbAnnotationMapper {
- private static final Logger logger = Logger.getLogger(DbIntegerAnnotationMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbIntegerAnnotationMapper.class);
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.ExtensionType;
* @version 1.0
*/
public class DbIntegerExtensionMapper extends DbExtensionMapper {
- private static final Logger logger = Logger.getLogger(DbIntegerExtensionMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbIntegerExtensionMapper.class);
import java.lang.reflect.Method;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>
implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
- private static final Logger logger = Logger.getLogger(DbLanguageMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbLanguageMapper.class);
private Method method;
private boolean isCache;
import java.sql.Types;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbLastActionMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbLastActionMapper.class);
public static final UUID uuidMarkerTypeHasNoLastAction = UUID.fromString("99652d5a-bc92-4251-b57d-0fec4d258ab7");
public static final UUID uuidAnnotationTypeLastAction = UUID.fromString("d0423ffd-d1dc-4571-ba05-eb724eec3c77");
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
*/
public class DbMarkerMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbMarkerMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbMarkerMapper.class);
private final MarkerType markerType;
\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbNullMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbNullMapper.class);\r
\r
private int sqlType;\r
\r
import java.sql.Types;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import eu.etaxonomy.cdm.io.common.DbExportConfiguratorBase;
public class DbObjectMapper
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>{
- private static final Logger logger = Logger.getLogger(DbObjectMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbObjectMapper.class);
boolean isCache;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DbOriginalNameMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbOriginalNameMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbOriginalNameMapper.class);
private boolean isCache = false;
\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class DbSequenceMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DbSequenceMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbSequenceMapper.class);\r
private int sqlType = Types.INTEGER; ;\r
private int sequence;\r
private int start = 0;\r
import java.util.Set;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
* @since 13.02.2012\r
*/\r
public class DbSimpleFilterMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {\r
- private static final Logger logger = Logger.getLogger(DbSimpleFilterMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(DbSimpleFilterMapper.class);\r
\r
/**\r
* Returns a filter mapper which filters out objects which have\r
import java.sql.SQLException;\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
extends CdmSingleAttributeMapperBase\r
implements IDbExportMapper<STATE, IExportTransformer> {\r
\r
- private static final Logger logger = Logger.getLogger(DbSingleAttributeExportMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DbSingleAttributeExportMapperBase.class);\r
\r
protected DbExportMapperBase<STATE> exportMapperHelper = new DbExportMapperBase<>();\r
private Integer precision = null;\r
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
public class DbSingleSourceMapper
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>{
- private static final Logger logger = Logger.getLogger(DbSingleSourceMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbSingleSourceMapper.class);
public enum EXCLUDE{
NONE,
import java.sql.Types;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
public class DbStringMapper
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {
- private static final Logger logger = Logger.getLogger(DbStringMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbStringMapper.class);
private static final int MAX_PRECISION = -1; //precision for datatype nvarchar(max) == clob (SQL Server 2008)
private boolean blankToNull = false;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DbTextDataMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbTextDataMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbTextDataMapper.class);
private final List<Language> languages;
private boolean restrictToGivenLanguages;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DbTimePeriodMapper extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbTimePeriodMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbTimePeriodMapper.class);
public static DbTimePeriodMapper NewInstance(String cdmAttributeString, String dbAttributeString){
return new DbTimePeriodMapper(cdmAttributeString, dbAttributeString, null, true);
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
public class DbUriMapper
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {
- private static final Logger logger = Logger.getLogger(DbUriMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbUriMapper.class);
private static final int MAX_PRECISION = -1; //precision for datatype nvarchar(max) == clob (SQL Server 2008)
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbUserMapper.class);
+ private static final Logger logger = LogManager.getLogger(DbUserMapper.class);
public static DbUserMapper NewInstance(String cdmAttributeString, String dbAttributeString){
return new DbUserMapper(cdmAttributeString, dbAttributeString, null, true);
\r
package eu.etaxonomy.cdm.io.common.mapping.out;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
import eu.etaxonomy.cdm.model.common.ExtensionType;\r
*/\r
public class ExportTransformerBase implements IExportTransformer {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ExportTransformerBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExportTransformerBase.class);\r
\r
@Override\r
public Object getKeyByFeature(Feature feature) throws UndefinedTransformerMethodException {\r
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
import eu.etaxonomy.cdm.io.common.Source;
implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IdIncMapper.class);
+ private static final Logger logger = LogManager.getLogger(IdIncMapper.class);
private Integer startValue;
private IndexCounter counter;
import java.sql.SQLException;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.DbExportConfiguratorBase.IdType;
import eu.etaxonomy.cdm.io.common.DbExportStateBase;
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>
implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer>{
- private static final Logger logger = Logger.getLogger(IdMapper.class);
+ private static final Logger logger = LogManager.getLogger(IdMapper.class);
public static IdMapper NewInstance(String dbIdAttributeString){
return new IdMapper(dbIdAttributeString);
\r
package eu.etaxonomy.cdm.io.common.mapping.out;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public class IndexCounter {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(IndexCounter.class);\r
+ private static final Logger logger = LogManager.getLogger(IndexCounter.class);\r
\r
int index = 0;\r
\r
import java.lang.reflect.Method;\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportBase;\r
extends DbSingleAttributeExportMapperBase<DbExportStateBase<?, IExportTransformer>>\r
implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer> {\r
\r
- private static final Logger logger = Logger.getLogger(MethodMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(MethodMapper.class);\r
\r
private Method method;\r
private Class<?>[] parameterTypes;\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
* @since 12.05.2009\r
*/\r
public class ObjectChangeMapper extends CdmAttributeMapperBase implements IDbExportMapper<DbExportStateBase<?, IExportTransformer>, IExportTransformer> {\r
- private static final Logger logger = Logger.getLogger(ObjectChangeMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(ObjectChangeMapper.class);\r
\r
private DbExportStateBase<?, IExportTransformer> state; //for possible later use\r
\r
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
import eu.etaxonomy.cdm.api.service.IService;
*/
public class ImportDeduplicationHelper {
- private static final Logger logger = Logger.getLogger(ImportDeduplicationHelper.class);
+ private static final Logger logger = LogManager.getLogger(ImportDeduplicationHelper.class);
private ICdmRepository repository;
import java.util.TreeMap;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
public class CsvNameExport extends CsvNameExportBase {
private static final long serialVersionUID = 7289805663701807425L;
- private static final Logger logger = Logger.getLogger(CsvNameExport.class);
+ private static final Logger logger = LogManager.getLogger(CsvNameExport.class);
@Autowired
private IEditGeoService geoService;
import javax.xml.stream.XMLStreamWriter;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.CdmExportBase;\r
implements ICdmExport<CsvDemoExportConfigurator, CsvDemoExportState>{\r
\r
private static final long serialVersionUID = -2962456879635841019L;\r
- private static final Logger logger = Logger.getLogger(CsvDemoBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoBase.class);\r
\r
protected static final boolean IS_CORE = true;\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
\r
private static final long serialVersionUID = 8265935377927091897L;\r
\r
- private static final Logger logger = Logger.getLogger(CsvDemoExport.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.tdwg.org/dwc/terms/Taxon";\r
private static final String fileName = "RedlistCoreTax.csv";\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.ExportResultType;\r
private static final long serialVersionUID = -2622502140734437961L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvDemoExportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoExportConfigurator.class);\r
\r
private String encoding = "UTF-8";\r
private String linesTerminatedBy = "\r\n";\r
import java.util.zip.ZipEntry;\r
import java.util.zip.ZipOutputStream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlExportState;\r
\r
*/\r
public class CsvDemoExportState extends XmlExportState<CsvDemoExportConfigurator>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvDemoExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoExportState.class);\r
\r
private final List<CsvDemoMetaDataRecord> metaRecords = new ArrayList<CsvDemoMetaDataRecord>();\r
private boolean isZip = false;\r
import java.io.IOException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
import eu.etaxonomy.cdm.io.dwca.out.TermMapping;\r
*\r
*/\r
public class CsvDemoExportTransformer extends InputTransformerBase {\r
- private static final Logger logger = Logger.getLogger(CsvDemoExportTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoExportTransformer.class);\r
\r
// private static Map<UUID, String> nomStatusMap = new HashMap<UUID, String>();\r
private static TermMapping nomStatusMapping;\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class CsvDemoId {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvDemoId.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoId.class);\r
\r
private Integer intId;\r
private String strId;\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
*/\r
public class CsvDemoMetaDataRecord {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvDemoMetaDataRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoMetaDataRecord.class);\r
\r
private String fileLocation;\r
private String rowType;\r
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.annotation.JsonIgnore;
public class CsvDemoRecord extends CsvDemoRecordBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CsvDemoRecord.class);
+ private static final Logger logger = LogManager.getLogger(CsvDemoRecord.class);
private String scientificNameId;
private String scientificName;
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Partial;\r
\r
*/\r
public abstract class CsvDemoRecordBase {\r
\r
- private static final Logger logger = Logger.getLogger(CsvDemoRecordBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvDemoRecordBase.class);\r
\r
//TODO Collection_SEPARATOR\r
protected static final CharSequence COLLECTION_SEPARATOR = "@";\r
import javax.xml.stream.XMLStreamWriter;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.CdmExportBase;\r
\r
private static final long serialVersionUID = 2719567114724597599L;\r
\r
- private static final Logger logger = Logger.getLogger(CsvExportBaseRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvExportBaseRedlist.class);\r
\r
protected static final boolean IS_CORE = true;\r
\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
public class CsvId {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvId.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvId.class);\r
\r
private Integer intId;\r
private String strId;\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
public class CsvMetaDataRecordRedlist {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvMetaDataRecordRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvMetaDataRecordRedlist.class);\r
\r
private String fileLocation;\r
private String rowType;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Partial;\r
\r
*/\r
public abstract class CsvRecordBaseRedlist {\r
\r
- private static final Logger logger = Logger.getLogger(CsvRecordBaseRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvRecordBaseRedlist.class);\r
\r
//TODO Collection_SEPARATOR\r
protected static final CharSequence COLLECTION_SEPARATOR = "@";\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;\r
private static final long serialVersionUID = 423795815976481982L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvTaxExportConfiguratorRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvTaxExportConfiguratorRedlist.class);\r
\r
private String encoding = "UTF-8";\r
private String linesTerminatedBy = "\r\n";\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
public class CsvTaxExportRedlist extends CsvExportBaseRedlist {\r
private static final long serialVersionUID = 841703025922543361L;\r
\r
- private static final Logger logger = Logger.getLogger(CsvTaxExportRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvTaxExportRedlist.class);\r
\r
private static final String ROW_TYPE = "http://rs.tdwg.org/dwc/terms/Taxon";\r
private static final String fileName = "RedlistCoreTax.csv";\r
import java.util.zip.ZipEntry;\r
import java.util.zip.ZipOutputStream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlExportState;\r
\r
*/\r
public class CsvTaxExportStateRedlist extends XmlExportState<CsvTaxExportConfiguratorRedlist>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvTaxExportStateRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvTaxExportStateRedlist.class);\r
\r
private List<CsvMetaDataRecordRedlist> metaRecords = new ArrayList<CsvMetaDataRecordRedlist>();\r
private boolean isZip = false;\r
import java.io.IOException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
import eu.etaxonomy.cdm.io.dwca.out.TermMapping;\r
*\r
*/\r
public class CsvTaxExportTransformerRedlist extends InputTransformerBase {\r
- private static final Logger logger = Logger.getLogger(CsvTaxExportTransformerRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvTaxExportTransformerRedlist.class);\r
\r
// private static Map<UUID, String> nomStatusMap = new HashMap<UUID, String>();\r
private static TermMapping nomStatusMapping;\r
import java.util.Collections;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.description.Feature;\r
public class CsvTaxRecordRedlist extends CsvRecordBaseRedlist{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CsvTaxRecordRedlist.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvTaxRecordRedlist.class);\r
\r
private String scientificNameId;\r
private String scientificName;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.ExportConfiguratorBase;
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
private static final long serialVersionUID = -4360021755279592592L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(StructureTreeOwlExportConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(StructureTreeOwlExportConfigurator.class);
private List<UUID> featureTreeUuids = new ArrayList<>();
private List<UUID> vocabularyUuids = new ArrayList<>();
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import com.hp.hpl.jena.rdf.model.Model;
private Model model;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(StructureTreeOwlExportState.class);
+ private static final Logger logger = LogManager.getLogger(StructureTreeOwlExportState.class);
public StructureTreeOwlExportState(StructureTreeOwlExportConfigurator config) {
super(config);
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;
private static final long serialVersionUID = -4360021755279592592L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(WordExportConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(WordExportConfigurator.class);
private TermTree featureTree;
*/
package eu.etaxonomy.cdm.io.descriptive.word.out;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.XmlExportState;
public class WordExportState extends XmlExportState<WordExportConfigurator>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(WordExportState.class);
+ private static final Logger logger = LogManager.getLogger(WordExportState.class);
public WordExportState(WordExportConfigurator config) {
super(config);
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
extends ExcelImportBase<ExcelDistributionUpdateState, ExcelDistributionUpdateConfigurator, ExcelRowBase>{
private static final long serialVersionUID = 621338661492857764L;
- private static final Logger logger = Logger.getLogger(ExcelDistributionUpdate.class);
+ private static final Logger logger = LogManager.getLogger(ExcelDistributionUpdate.class);
private static final String AREA_MAP = "AreaMap";
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;
private static final String SINGLE_CLASSIFICATION = "Single Classification";
- private static Logger logger = Logger.getLogger(DwcTaxonCsv2CdmTaxonRelationConverter.class);
+ private static Logger logger = LogManager.getLogger(DwcTaxonCsv2CdmTaxonRelationConverter.class);
private static final String ID = "id";
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import com.ibm.lsid.MalformedLSIDException;
extends PartitionableConverterBase<CONFIG, STATE>
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>, ItemFilter<StreamItem> {
- private static final Logger logger = Logger.getLogger(DwcTaxonStreamItem2CdmTaxonConverter.class);
+ private static final Logger logger = LogManager.getLogger(DwcTaxonStreamItem2CdmTaxonConverter.class);
//if this converter is used as filter we may not want to delete item parts during evaluation
boolean isFilterOnly = false;
*/\r
package eu.etaxonomy.cdm.io.dwca.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.IItemStream;\r
import eu.etaxonomy.cdm.io.stream.StreamImportBase;\r
\r
private static final long serialVersionUID = 8816075241549849925L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaDataImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDataImportBase.class);\r
\r
\r
@Override\r
package eu.etaxonomy.cdm.io.dwca.in;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.ICdmDataSource;
private static final long serialVersionUID = 7091818889753715572L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaDataImportConfiguratorBase.class);
+ private static final Logger logger = LogManager.getLogger(DwcaDataImportConfiguratorBase.class);
private boolean doSplitRelationshipImport = false;
private boolean doSynonymRelationships = true;
\r
package eu.etaxonomy.cdm.io.dwca.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.StreamImportBase;\r
import eu.etaxonomy.cdm.io.stream.StreamImportStateBase;\r
public abstract class DwcaDataImportStateBase<CONFIG extends DwcaDataImportConfiguratorBase>\r
extends StreamImportStateBase<CONFIG, StreamImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaDataImportStateBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDataImportStateBase.class);\r
\r
public DwcaDataImportStateBase(CONFIG config) {\r
super(config);\r
*/
package eu.etaxonomy.cdm.io.dwca.in;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.URI;
extends DwcaDataImportBase<DwcaImportConfigurator, DwcaImportState>{
private static final long serialVersionUID = -4340782092317841321L;
- private static final Logger logger = Logger.getLogger(DwcaImport.class);
+ private static final Logger logger = LogManager.getLogger(DwcaImport.class);
@Override
protected void doInvoke(DwcaImportState state) {
*/
package eu.etaxonomy.cdm.io.dwca.in;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.ICdmDataSource;
private static final long serialVersionUID = 6932718596034946336L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaImportConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(DwcaImportConfigurator.class);
private static IInputTransformer defaultTransformer = new DwcaImportTransformer();
package eu.etaxonomy.cdm.io.dwca.in;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author a.mueller
*/
public class DwcaImportState extends DwcaDataImportStateBase<DwcaImportConfigurator>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaImportState.class);
+ private static final Logger logger = LogManager.getLogger(DwcaImportState.class);
public DwcaImportState(DwcaImportConfigurator config) {
super(config);
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
private static final long serialVersionUID = 3204045957159056826L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaImportTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaImportTransformer.class);\r
\r
private static final UUID uuidFeatureBiology = UUID.fromString("daf92173-a262-49f1-9a45-923941d9c557");\r
\r
import javax.xml.bind.Unmarshaller;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import au.com.bytecode.opencsv.CSVParser;
import au.com.bytecode.opencsv.CSVReader;
* @since 17.10.2011
*/
public class DwcaZipToStreamConverter<STATE extends DwcaImportState> {
- private static Logger logger = Logger.getLogger(DwcaZipToStreamConverter.class);
+ private static Logger logger = LogManager.getLogger(DwcaZipToStreamConverter.class);
private final String META_XML = "meta.xml";
protected static final boolean IS_CORE = true;
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;\r
import eu.etaxonomy.cdm.io.stream.IReader;\r
public class EolAgent2CdmConverter extends PartitionableConverterBase<DwcaDataImportConfiguratorBase, DwcaDataImportStateBase<DwcaDataImportConfiguratorBase>>\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(EolAgent2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(EolAgent2CdmConverter.class);\r
private static final String CORE_ID = "coreId";\r
\r
/**\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GbifDescriptionCsv2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifDescriptionCsv2CdmConverter.class);\r
\r
private static final String CORE_ID = "coreId";\r
\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GbifDistributionCsv2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifDistributionCsv2CdmConverter.class);\r
\r
private static final String CORE_ID = "coreId";\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;\r
import eu.etaxonomy.cdm.io.stream.IReader;\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GbifImageCsv2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifImageCsv2CdmConverter.class);\r
\r
private static final String CORE_ID = "coreId";\r
\r
import java.util.Set;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import com.ibm.lsid.MalformedLSIDException;\r
\r
public class GbifReferenceCsv2CdmConverter extends PartitionableConverterBase<DwcaDataImportConfiguratorBase, DwcaDataImportStateBase<DwcaDataImportConfiguratorBase>>\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>{\r
\r
- private static final Logger logger = Logger.getLogger(GbifReferenceCsv2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifReferenceCsv2CdmConverter.class);\r
\r
private static final String CORE_ID = "coreId";\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;\r
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GbifTypesAndSpecimen2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifTypesAndSpecimen2CdmConverter.class);\r
\r
private static final String CORE_ID = "coreId";\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.IPartitionableConverter;\r
import eu.etaxonomy.cdm.io.stream.IReader;\r
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String> {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GbifVernacularNameCsv2CdmConverter.class);\r
+ private static final Logger logger = LogManager.getLogger(GbifVernacularNameCsv2CdmConverter.class);\r
private static final String CORE_ID = "coreId";\r
\r
/**\r
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.common.CdmBase;
private static final long serialVersionUID = -5467295551060073610L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaDataExportBase.class);
+ private static final Logger logger = LogManager.getLogger(DwcaDataExportBase.class);
abstract protected void handleTaxonNode(DwcaTaxExportState state, TaxonNode node)throws IOException, FileNotFoundException, UnsupportedEncodingException;
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.format.description.CategoricalDataFormatter;\r
import eu.etaxonomy.cdm.format.description.QuantitativeDataFormatter;\r
\r
private static final long serialVersionUID = 4756084824053120718L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaDescriptionExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDescriptionExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/Description";\r
protected static final String fileName = "description.txt";\r
import java.net.URISyntaxException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
*/\r
public class DwcaDescriptionRecord extends DwcaRecordBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaDescriptionRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDescriptionRecord.class);\r
\r
private String description;\r
private Feature type;\r
import java.io.UnsupportedEncodingException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
\r
private static final long serialVersionUID = -3274468345456407430L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaDistributionExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDistributionExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/Distribution";\r
protected static final String fileName = "distribution.txt";\r
import java.net.URISyntaxException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class DwcaDistributionRecord extends DwcaRecordBase implements IDwcaAreaRecord{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaDistributionRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaDistributionRecord.class);\r
\r
private DwcaId locationId;\r
private String locationIdString;\r
import javax.xml.stream.XMLStreamException;\r
import javax.xml.stream.XMLStreamWriter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Partial;\r
import org.joda.time.format.DateTimeFormat;\r
\r
private static final long serialVersionUID = -1762545757384406718L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaEmlExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaEmlExport.class);\r
\r
protected static final String fileName = "eml.xml";\r
\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
public class DwcaEmlRecord extends DwcaRecordBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaEmlRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaEmlRecord.class);\r
\r
// BASIC\r
private String identifier;\r
import javax.xml.stream.XMLStreamException;\r
import javax.xml.stream.XMLStreamWriter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmExportBase;\r
import eu.etaxonomy.cdm.io.common.ICdmExport;\r
private static final long serialVersionUID = -3214410418410044139L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaExportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaExportBase.class);\r
\r
protected static final boolean IS_CORE = true;\r
\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public class DwcaId {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaId.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaId.class);\r
\r
private Integer intId;\r
private String strId;\r
import java.io.UnsupportedEncodingException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.common.Language;\r
public class DwcaImageExport extends DwcaDataExportBase {\r
private static final long serialVersionUID = -4997807762779037215L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaImageExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaImageExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/Image";\r
protected static final String fileName = "images.txt";\r
import java.net.URISyntaxException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
public class DwcaImageRecord extends DwcaRecordBase{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaImageRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaImageRecord.class);\r
\r
private URI identifier;\r
private String title;\r
import javax.xml.stream.XMLStreamWriter;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
\r
import eu.etaxonomy.cdm.io.dwca.out.DwcaMetaDataRecord.FieldEntry;\r
\r
private static final long serialVersionUID = -4033439569151252697L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaMetaDataExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaMetaDataExport.class);\r
\r
protected static final String fileName = "meta.xml";\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
*/\r
public class DwcaMetaDataRecord {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaMetaDataRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaMetaDataRecord.class);\r
\r
private String fileLocation;\r
private String rowType;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Partial;\r
\r
*/\r
public abstract class DwcaRecordBase {\r
\r
- private static final Logger logger = Logger.getLogger(DwcaRecordBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaRecordBase.class);\r
\r
//TODO Collection_SEPARATOR\r
protected static final CharSequence COLLECTION_SEPARATOR = "@";\r
import java.io.UnsupportedEncodingException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
\r
private static final long serialVersionUID = -8334741499089219441L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaReferenceExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaReferenceExport.class);\r
\r
protected static final String fileName = "reference.txt";\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/Reference";\r
import java.net.URISyntaxException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
*/\r
public class DwcaReferenceRecord extends DwcaRecordBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaReferenceRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaReferenceRecord.class);\r
\r
private String isbnIssn;\r
private URI uri;\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
public class DwcaResourceRelationExport extends DwcaDataExportBase {\r
private static final long serialVersionUID = 33810773244068812L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaResourceRelationExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaResourceRelationExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.tdwg.org/dwc/terms/ResourceRelationship";\r
protected static final String fileName = "resourceRelationship.txt";\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.common.Annotation;\r
*/\r
public class DwcaResourceRelationRecord extends DwcaRecordBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaResourceRelationRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaResourceRelationRecord.class);\r
\r
private DwcaId resourceRelationshipId;\r
private UUID relatedResourceId;\r
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
/**
private static final long serialVersionUID = -1657568483721887287L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaDescriptionExport.class);
+ private static final Logger logger = LogManager.getLogger(DwcaDescriptionExport.class);
/**
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Component;\r
\r
public class DwcaTaxExport extends DwcaExportBase {\r
private static final long serialVersionUID = -3770976064909193441L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaTaxExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTaxExport.class);\r
\r
\r
@Autowired\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.ExportResultType;\r
private static final long serialVersionUID = -464609596078614735L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaTaxExportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTaxExportConfigurator.class);\r
\r
private String encoding = "UTF-8";\r
private String linesTerminatedBy = "\r\n";\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlExportState;\r
import eu.etaxonomy.cdm.io.common.ZipWriter;\r
public class DwcaTaxExportState extends XmlExportState<DwcaTaxExportConfigurator>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaTaxExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTaxExportState.class);\r
\r
private DwcaResultProcessor processor = new DwcaResultProcessor(this);\r
\r
import java.io.IOException;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.out.ExportTransformerBase;\r
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
*/\r
public class DwcaTaxExportTransformer extends ExportTransformerBase {\r
\r
- private static final Logger logger = Logger.getLogger(DwcaTaxExportTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTaxExportTransformer.class);\r
\r
private static TermMapping nomStatusMapping;\r
private static TermMapping rankMapping;\r
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.common.Annotation;
public class DwcaTaxonExport extends DwcaDataExportBase {
private static final long serialVersionUID = -3770976064909193441L;
- private static final Logger logger = Logger.getLogger(DwcaTaxonExport.class);
+ private static final Logger logger = LogManager.getLogger(DwcaTaxonExport.class);
private static final String ROW_TYPE = "http://rs.tdwg.org/dwc/terms/Taxon";
protected static final String fileName = "coreTax.txt";
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import eu.etaxonomy.cdm.io.stream.terms.TermUri;
*/
public class DwcaTaxonRecord extends DwcaRecordBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaTaxonRecord.class);
+ private static final Logger logger = LogManager.getLogger(DwcaTaxonRecord.class);
private DwcaId scientificNameId;
private UUID acceptedNameUsageId;
import java.io.UnsupportedEncodingException;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;\r
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;\r
\r
private static final long serialVersionUID = 8879154738843628476L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaTypesExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTypesExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/TypesAndSpecimen";\r
protected static final String fileName = "typesAndSpecimen.txt";\r
import java.io.PrintWriter;\r
import java.net.URISyntaxException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
*/\r
public class DwcaTypesRecord extends DwcaRecordBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaTypesRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaTypesRecord.class);\r
\r
private String bibliographicCitation;\r
private TypeDesignationStatusBase<?> typeStatus;\r
import java.util.Set;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
public class DwcaVernacularExport extends DwcaDataExportBase {\r
private static final long serialVersionUID = 3169086545830374918L;\r
\r
- private static final Logger logger = Logger.getLogger(DwcaVernacularExport.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaVernacularExport.class);\r
\r
private static final String ROW_TYPE = "http://rs.gbif.org/terms/1.0/VernacularName";\r
protected static final String fileName = "vernacular.txt";\r
import java.io.PrintWriter;\r
import java.net.URISyntaxException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
import eu.etaxonomy.cdm.model.common.Language;\r
*/\r
public class DwcaVernacularRecord extends DwcaRecordBase implements IDwcaAreaRecord{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaVernacularRecord.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaVernacularRecord.class);\r
\r
private String vernacularName;\r
private String source;\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import au.com.bytecode.opencsv.CSVReader;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
*/\r
public class TermMapping {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(TermMapping.class);\r
+ private static Logger logger = LogManager.getLogger(TermMapping.class);\r
\r
private static final String COMMENT = "//";\r
\r
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.support.DefaultTransactionStatus;
import eu.etaxonomy.cdm.common.CdmUtils;
extends CdmImportBase<CONFIG, STATE> {
private static final long serialVersionUID = 2759164811664484732L;
- private static final Logger logger = Logger.getLogger(ExcelImportBase.class);
+ private static final Logger logger = LogManager.getLogger(ExcelImportBase.class);
protected static final String SCIENTIFIC_NAME_COLUMN = "ScientificName";
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
extends ImportConfiguratorBase<ExcelImportState, URI>{\r
\r
private static final long serialVersionUID = 9031559773350645304L;\r
- private static final Logger logger = Logger.getLogger(ExcelImportConfiguratorBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExcelImportConfiguratorBase.class);\r
\r
//TODO\r
private static IInputTransformer defaultTransformer = null;\r
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.io.common.ImportStateBase;
extends ImportStateBase<CONFIG, ExcelImportBase>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExcelImportState.class);
+ private static final Logger logger = LogManager.getLogger(ExcelImportState.class);
private Integer currentLine;
private ROW currentRow;
import java.util.TreeMap;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelTaxonOrSpecimenImportBase.SourceType;\r
import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
*/\r
public abstract class ExcelRowBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ExcelRowBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExcelRowBase.class);\r
\r
private UUID cdmUuid = null;\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.pager.Pager;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
*/\r
public abstract class ExcelTaxonOrSpecimenImportBase<STATE extends ExcelImportState<CONFIG, ROW>, CONFIG extends ExcelImportConfiguratorBase, ROW extends ExcelRowBase>\r
extends ExcelImportBase<STATE, CONFIG, ROW> {\r
- private static final Logger logger = Logger.getLogger(ExcelTaxonOrSpecimenImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ExcelTaxonOrSpecimenImportBase.class);\r
\r
\r
protected static final String CDM_UUID_COLUMN = "(?i)(CdmUuid)";\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
\r
private static final long serialVersionUID = 7765309119416657235L;\r
\r
- private static final Logger logger = Logger.getLogger(DistributionImport.class);\r
+ private static final Logger logger = LogManager.getLogger(DistributionImport.class);\r
\r
/* used */\r
private static final String EDIT_NAME_COLUMN = "EDIT";\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
public class DistributionImportConfigurator extends ExcelImportConfiguratorBase implements IImportConfigurator {\r
\r
private static final long serialVersionUID = -4283236727158858201L;\r
- private static final Logger logger = Logger.getLogger(DistributionImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(DistributionImportConfigurator.class);\r
\r
@Override\r
@SuppressWarnings("unchecked")\r
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
*
*/
public class ExcelRecordStream implements IItemStream{
- private static Logger logger = Logger.getLogger(ExcelRecordStream.class);
+ private static Logger logger = LogManager.getLogger(ExcelRecordStream.class);
private ExcelStreamImportState state;
\r
package eu.etaxonomy.cdm.io.excel.stream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.dwca.in.DwcaDataImportStateBase;\r
import eu.etaxonomy.cdm.io.dwca.in.DwcaImportState;\r
*/\r
public class ExcelStreamImportState extends DwcaDataImportStateBase<ExcelStreamImportConfigurator>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaImportState.class);\r
\r
public ExcelStreamImportState(ExcelStreamImportConfigurator config) {\r
super(config);\r
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
*/
public class ExcelToStreamConverter<STATE extends ExcelStreamImportState> {
- private static Logger logger = Logger.getLogger(ExcelToStreamConverter.class);
+ private static Logger logger = LogManager.getLogger(ExcelToStreamConverter.class);
private URI source;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
public class NormalExplicitImport extends TaxonExcelImportBase {
private static final long serialVersionUID = 3642423349766191160L;
- private static final Logger logger = Logger.getLogger(NormalExplicitImport.class);
+ private static final Logger logger = LogManager.getLogger(NormalExplicitImport.class);
public static Set<String> validMarkers = new HashSet<>(Arrays.asList(new String[]{"", "valid", "accepted", "a", "v", "t", "!"}));
public static Set<String> synonymMarkers = new HashSet<>(Arrays.asList(new String[]{"**","invalid", "synonym", "s", "i"}));
import eu.etaxonomy.cdm.common.URI;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
\r
public class NormalExplicitImportConfigurator extends ExcelImportConfiguratorBase implements IImportConfigurator, IMatchingImportConfigurator {\r
- private static final Logger logger = Logger.getLogger(NormalExplicitImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(NormalExplicitImportConfigurator.class);\r
\r
private boolean isDoMatchTaxa = true;\r
\r
package eu.etaxonomy.cdm.io.excel.taxa;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.excel.common.ExcelImportConfiguratorBase;
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
extends ExcelTaxonOrSpecimenImportBase<TaxonExcelImportState, ExcelImportConfiguratorBase, ExcelRowBase> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonExcelImportBase.class);
+ private static final Logger logger = LogManager.getLogger(TaxonExcelImportBase.class);
/*
* Supported Columns:
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelImportConfiguratorBase;\r
import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;\r
extends ExcelImportState<ExcelImportConfiguratorBase, ExcelRowBase>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonExcelImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonExcelImportState.class);\r
\r
/** Already processed authors */\r
private Set<String> authors = new HashSet<>();\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
extends SimpleImport<IdentifierImportConfigurator, File>{
private static final long serialVersionUID = 5797541146159665997L;
- private static Logger logger = Logger.getLogger(IdentifierImport.class);
+ private static Logger logger = LogManager.getLogger(IdentifierImport.class);
@Override
protected void doInvoke(IdentifierImportConfigurator config) {
import javax.xml.validation.Schema;\r
import javax.xml.validation.SchemaFactory;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.apache.xml.resolver.tools.CatalogResolver;\r
import org.springframework.core.io.ClassPathResource;\r
import org.springframework.core.io.Resource;\r
//which allows to package the schemas into a jar file.\r
public class CdmDocumentBuilder extends Jaxb2Marshaller {\r
\r
- private static final Logger logger = Logger.getLogger(CdmDocumentBuilder.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDocumentBuilder.class);\r
private boolean formattedOutput = Boolean.TRUE;\r
private String encoding = "UTF-8";\r
\r
\r
import javax.xml.bind.ValidationEventHandler;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.xml.sax.SAXException;\r
\r
\r
public class CdmIDResolver extends IDResolver {\r
\r
- private static final Logger logger = Logger.getLogger(CdmIDResolver.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmIDResolver.class);\r
\r
private IUserService userService;\r
\r
import javax.xml.transform.stream.StreamResult;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
implements ICdmExport<JaxbExportConfigurator, JaxbExportState> {
private static final long serialVersionUID = -525533131708894145L;
- private static final Logger logger = Logger.getLogger(JaxbExport.class);
+ private static final Logger logger = LogManager.getLogger(JaxbExport.class);
private DataSet dataSet;
\r
import java.io.File;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.ExportConfiguratorBase;\r
private static final long serialVersionUID = -3081392679701925440L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(JaxbExportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(JaxbExportConfigurator.class);\r
\r
private int maxRows = 0;\r
private boolean formattedOutput = Boolean.TRUE;\r
\r
import java.io.File;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.ExportStateBase;\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
extends ExportStateBase<JaxbExportConfigurator, IExportTransformer, File>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(JaxbExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(JaxbExportState.class);\r
\r
\r
public JaxbExportState(JaxbExportConfigurator config) {\r
import java.util.Collection;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
implements ICdmIO<JaxbImportState> {\r
\r
private static final long serialVersionUID = -96388140688227297L;\r
- private static final Logger logger = Logger.getLogger(JaxbImport.class);\r
+ private static final Logger logger = LogManager.getLogger(JaxbImport.class);\r
\r
private CdmDocumentBuilder cdmDocumentBuilder = null;\r
\r
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
*/\r
public class JaxbImportConfigurator extends ImportConfiguratorBase<JaxbImportState, URI> implements IImportConfigurator {\r
\r
- private static final Logger logger = Logger.getLogger(JaxbImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(JaxbImportConfigurator.class);\r
\r
private int maxRows = 0;\r
\r
\r
package eu.etaxonomy.cdm.io.jaxb;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
*/\r
public class JaxbImportState extends ImportStateBase<JaxbImportConfigurator, CdmImportBase<JaxbImportConfigurator, JaxbImportState>>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(JaxbImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(JaxbImportState.class);\r
\r
\r
public JaxbImportState(JaxbImportConfigurator config) {\r
import javax.xml.bind.ValidationEventLocator;\r
import javax.xml.bind.helpers.DefaultValidationEventHandler;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
public class WarningTolerantValidationEventHandler extends\r
DefaultValidationEventHandler {\r
- private static final Logger logger = Logger.getLogger(WarningTolerantValidationEventHandler.class);\r
+ private static final Logger logger = LogManager.getLogger(WarningTolerantValidationEventHandler.class);\r
\r
public boolean handleEvent(ValidationEvent validationEvent) {\r
// ignore warnings\r
import javax.xml.stream.events.StartElement;\r
import javax.xml.stream.events.XMLEvent;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
* @since 28.06.2011\r
*/\r
public class LookAheadEventReader implements XMLEventReader {\r
- private static final Logger logger = Logger.getLogger(LookAheadEventReader.class);\r
+ private static final Logger logger = LogManager.getLogger(LookAheadEventReader.class);\r
\r
private XMLEventReader reader;\r
\r
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
private static final long serialVersionUID = -961438861319456892L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupDocumentImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupDocumentImport.class);
// TODO make part of state, but state is renewed when invoking the import a
import javax.xml.stream.events.XMLEvent;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
*/
public class MarkupDocumentImportNoComponent extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupDocumentImportNoComponent.class);
+ private static final Logger logger = LogManager.getLogger(MarkupDocumentImportNoComponent.class);
private final MarkupKeyImport keyImport;
import javax.xml.stream.events.XMLEvent;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
*/
public class MarkupFeatureImport extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupFeatureImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupFeatureImport.class);
protected static final String MODS_TITLEINFO = "titleInfo";
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.WordUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ITermService;
* @since 04.08.2008
*/
public abstract class MarkupImportBase {
- private static final Logger logger = Logger.getLogger(MarkupImportBase.class);
+ private static final Logger logger = LogManager.getLogger(MarkupImportBase.class);
//Base
protected static final String ALTITUDE = "altitude";
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
public class MarkupImportConfigurator extends XmlImportConfiguratorBase<MarkupImportState> implements IImportConfigurator {\r
private static final long serialVersionUID = 779807547137921079L;\r
\r
- private static final Logger logger = Logger.getLogger(MarkupImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(MarkupImportConfigurator.class);\r
\r
public static MarkupImportConfigurator NewInstance(URI uri, ICdmDataSource destination){\r
return new MarkupImportConfigurator(uri, destination);\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.XmlImportState;\r
*/\r
public class MarkupImportState extends XmlImportState<MarkupImportConfigurator, MarkupDocumentImport>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MarkupImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(MarkupImportState.class);\r
\r
private UnmatchedLeads unmatchedLeads;\r
private boolean onlyNumberedTaxaExist; //attribute in <key>\r
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.XMLEvent;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.UTF8;
*/
public class MarkupKeyImport extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupKeyImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupKeyImport.class);
public MarkupKeyImport(MarkupDocumentImport docImport) {
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.GeneralParser;
*/
public class MarkupModsImport extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupModsImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupModsImport.class);
protected static final String MODS_TITLEINFO = "titleInfo";
protected static final String MODS_ABSTRACT = "abstract";
import javax.xml.stream.events.XMLEvent;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
*/
public class MarkupNomenclatureImport extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupNomenclatureImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupNomenclatureImport.class);
// private NonViralNameParserImpl parser = new NonViralNameParserImpl();
import javax.xml.stream.events.XMLEvent;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
*/
public class MarkupSpecimenImport extends MarkupImportBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupSpecimenImport.class);
+ private static final Logger logger = LogManager.getLogger(MarkupSpecimenImport.class);
private static final String ALTERNATIVE_COLLECTION_TYPE_STATUS = "alternativeCollectionTypeStatus";
private static final String ALTERNATIVE_COLLECTOR = "alternativeCollector";
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;
private static final long serialVersionUID = -3910080152461421047L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MarkupTransformer.class);
+ private static final Logger logger = LogManager.getLogger(MarkupTransformer.class);
//preliminary
public static final UUID uuidKalimantan = UUID.fromString("05c6bce3-2e55-48cb-a414-707e936066d1");
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
public class UnmatchedLeads {
- private static final Logger logger = Logger.getLogger(UnmatchedLeads.class);
+ private static final Logger logger = LogManager.getLogger(UnmatchedLeads.class);
private final Map<UnmatchedLeadsKey, Set<PolytomousKeyNode>> map = new HashMap<UnmatchedLeadsKey, Set<PolytomousKeyNode>>();
*/\r
package eu.etaxonomy.cdm.io.markup.handler;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.xml.sax.Attributes;\r
import org.xml.sax.SAXException;\r
\r
*/\r
public class PublicationHandler extends ImportHandlerBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PublicationHandler.class);\r
+ private static final Logger logger = LogManager.getLogger(PublicationHandler.class);\r
\r
private boolean isInPublication;\r
private ImportHandlerBase currentHandler = null;\r
*/\r
package eu.etaxonomy.cdm.io.markup.handler;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.xml.sax.Attributes;\r
import org.xml.sax.SAXException;\r
\r
*/\r
public class TreatmentHandler extends ImportHandlerBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TreatmentHandler.class);\r
+ private static final Logger logger = LogManager.getLogger(TreatmentHandler.class);\r
\r
private boolean isInTaxon;\r
\r
*/
package eu.etaxonomy.cdm.io.operation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.config.CacheUpdaterConfigurator;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
private static final long serialVersionUID = -3063590000817699527L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CacheUpdaterConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(CacheUpdaterConfigurator.class);
private boolean doReferences = true;
private boolean doAuthors = true;
import java.io.PrintWriter;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
// TODO: public class JaxbExport extends CdmIoBase implements ICdmIO {\r
\r
private static final long serialVersionUID = -7530748162895106222L;\r
- private static final Logger logger = Logger.getLogger(PilotOutputDescriptionExporter.class);\r
+ private static final Logger logger = LogManager.getLogger(PilotOutputDescriptionExporter.class);\r
private PilotOutputDocumentBuilder pilotOutputDocumentBuilder = null;\r
\r
private String ioName = null;\r
\r
import javax.xml.bind.Marshaller;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.jaxb.CdmMarshallerListener;\r
import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
\r
private SDDDataSet cdmSource;\r
\r
- private static final Logger logger = Logger.getLogger(PilotOutputDocumentBuilder.class);\r
+ private static final Logger logger = LogManager.getLogger(PilotOutputDocumentBuilder.class);\r
\r
// private SDDContext sddContext;\r
\r
\r
import java.io.File;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;\r
private static final long serialVersionUID = 8545847974141343807L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PilotOutputExportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(PilotOutputExportConfigurator.class);\r
\r
private int maxRows = 0;\r
\r
\r
package eu.etaxonomy.cdm.io.pilotOutputHtml;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlExportState;\r
\r
*/\r
public class PilotOutputExportState extends XmlExportState<PilotOutputExportConfigurator>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PilotOutputExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(PilotOutputExportState.class);\r
\r
public PilotOutputExportState(PilotOutputExportConfigurator config) {\r
super(config);\r
import java.io.PrintWriter;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
\r
// TODO: public class JaxbExport extends CdmIoBase implements ICdmIO {\r
\r
private static final long serialVersionUID = -5556376038773540067L;\r
- private static final Logger logger = Logger.getLogger(PilotOutputExporter.class);\r
+ private static final Logger logger = LogManager.getLogger(PilotOutputExporter.class);\r
private PilotOutputDocumentBuilder pilotOutputDocumentBuilder = null;\r
\r
private boolean doOccurrence = true;\r
\r
package eu.etaxonomy.cdm.io.reference.endnote.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
extends CdmImportBase<EndnoteImportConfigurator, EndnoteImportState> {\r
\r
private static final long serialVersionUID = 6644348267081220104L;\r
- private static final Logger logger = Logger.getLogger(EndNoteImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(EndNoteImportBase.class);\r
\r
protected Element getXmlElement(EndnoteImportConfigurator tcsConfig){\r
Element root = tcsConfig.getSourceRoot();\r
import eu.etaxonomy.cdm.common.URI;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
extends ImportConfiguratorBase<EndnoteImportState, URI> {\r
\r
private static final long serialVersionUID = 2763770696094215281L;\r
- private static final Logger logger = Logger.getLogger(EndnoteImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(EndnoteImportConfigurator.class);\r
\r
//TODO\r
private static IInputTransformer defaultTransformer = null;\r
\r
package eu.etaxonomy.cdm.io.reference.endnote.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
\r
public class EndnoteImportState\r
extends ImportStateBase<EndnoteImportConfigurator, EndNoteImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(EndnoteImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(EndnoteImportState.class);\r
\r
public EndnoteImportState(EndnoteImportConfigurator config) {\r
super(config);\r
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
implements ICdmIO<EndnoteImportState> {\r
\r
private static final long serialVersionUID = -8591314328811284619L;\r
- private static final Logger logger = Logger.getLogger(EndnoteRecordsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(EndnoteRecordsImport.class);\r
\r
private static int modCount = 1000;\r
\r
\r
package eu.etaxonomy.cdm.io.reference.endnote.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
\r
import eu.etaxonomy.cdm.io.tcsxml.DefaultTcsXmlPlaceholders;\r
* @version 1.0\r
*/\r
public class IEndnotePlaceholderClass implements ITcsXmlPlaceholderClass {\r
- private static final Logger logger = Logger.getLogger(DefaultTcsXmlPlaceholders.class);\r
+ private static final Logger logger = LogManager.getLogger(DefaultTcsXmlPlaceholders.class);\r
\r
/* (non-Javadoc)\r
* @see tcsxml.ITcsXmlPlaceholderClass#makeMetaDataDetailed(tcsxml.TcsXmlImportConfigurator, org.jdom.Element)\r
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = 7022034669942979722L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RisReferenceImport.class);
+ private static final Logger logger = LogManager.getLogger(RisReferenceImport.class);
@Override
protected void doInvoke(RisReferenceImportState state) {
\r
package eu.etaxonomy.cdm.io.sdd;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
\r
*/\r
public abstract class SDDIoBase extends CdmIoBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SDDIoBase.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDIoBase.class);\r
\r
}\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
*/\r
public class SDDTransformer extends InputTransformerBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SDDTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDTransformer.class);\r
\r
\r
\r
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = -6817762818458834785L;
- public static final Logger logger = Logger.getLogger(IkeyPlusImport.class);
+ public static final Logger logger = LogManager.getLogger(IkeyPlusImport.class);
private TermVocabulary<Feature> featureVoc;
package eu.etaxonomy.cdm.io.sdd.ikeyplus;
import eu.etaxonomy.cdm.common.URI;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
*
*/
public class IkeyPlusImportConfigurator extends ImportConfiguratorBase<IkeyPlusImportState, URI> {
- public static final Logger logger = Logger.getLogger(IkeyPlusImportConfigurator.class);
+ public static final Logger logger = LogManager.getLogger(IkeyPlusImportConfigurator.class);
private static IInputTransformer defaultTransformer = null;
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.joda.time.DateTime;\r
public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportState> implements ICdmImport<SDDImportConfigurator, SDDImportState> {\r
private static final long serialVersionUID = 5492939941309574059L;\r
\r
- private static final Logger logger = Logger.getLogger(SDDImport.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDImport.class);\r
\r
private static int modCount = 1000;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
public class SDDImportConfigurator extends XmlImportConfiguratorBase<SDDImportState> implements IImportConfigurator, IMatchingImportConfigurator {\r
private static final long serialVersionUID = -960998183005112130L;\r
\r
- private static final Logger logger = Logger.getLogger(SDDImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDImportConfigurator.class);\r
\r
//TODO\r
private static IInputTransformer defaultTransformer = new SDDTransformer();\r
\r
package eu.etaxonomy.cdm.io.sdd.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlImportState;\r
\r
*/\r
public class SDDImportState extends XmlImportState<SDDImportConfigurator, SDDImport>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SDDImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDImportState.class);\r
\r
public SDDImportState(SDDImportConfigurator config) {\r
super(config);\r
import java.io.PrintWriter;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.TransactionStatus;\r
import org.springframework.util.ResourceUtils;\r
// TODO: public class JaxbExport extends CdmIoBase implements ICdmIO {\r
\r
private static final long serialVersionUID = 6294052197732385842L;\r
- private static final Logger logger = Logger.getLogger(SDDCdmExporter.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDCdmExporter.class);\r
private SDDDocumentBuilder sddDocumentBuilder = null;\r
\r
/**\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
-\r
package eu.etaxonomy.cdm.io.sdd.out;\r
\r
import java.io.File;\r
\r
import javax.xml.bind.Marshaller;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.apache.xerces.dom.DocumentImpl;\r
import org.apache.xerces.dom.ElementImpl;\r
import org.apache.xerces.impl.xpath.regex.ParseException;\r
\r
private final Language defaultLanguage = Language.DEFAULT();\r
\r
- private static final Logger logger = Logger\r
- .getLogger(SDDDocumentBuilder.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDDocumentBuilder.class);\r
\r
public SDDDocumentBuilder() throws SAXException, IOException {\r
document = new DocumentImpl();\r
\r
import java.io.File;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;\r
private static final long serialVersionUID = 2416094455247924084L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SDDExportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDExportConfigurator.class);\r
\r
private int maxRows = 0;\r
\r
\r
package eu.etaxonomy.cdm.io.sdd.out;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.XmlExportState;\r
\r
*/\r
public class SDDExportState extends XmlExportState<SDDExportConfigurator>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SDDExportState.class);\r
+ private static final Logger logger = LogManager.getLogger(SDDExportState.class);\r
\r
public SDDExportState(SDDExportConfigurator config) {\r
super(config);\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
extends CdmImportBase<CONFIG, STATE> {
private static final long serialVersionUID = 4423065367998125678L;
- private static final Logger logger = Logger.getLogger(SpecimenImportBase.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenImportBase.class);
protected static final UUID SPECIMEN_SCAN_TERM = UUID.fromString("acda15be-c0e2-4ea8-8783-b9b0c4ad7f03");
import javax.swing.JTextArea;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
public class SpecimenUserInteraction implements ItemListener, Serializable {
private static final long serialVersionUID = 6384263183459028523L;
+
@SuppressWarnings("unused")
- private static Logger log = Logger.getLogger(SpecimenUserInteraction.class);
+ private static Logger log = LogManager.getLogger(SpecimenUserInteraction.class);
public Classification askForClassification(Map<String, Classification> classMap){
List<String> possibilities = new ArrayList<String>(classMap.keySet());
import javax.swing.JTextArea;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
* @since 20.10.2008
*/
public class UnitsGatheringArea {
- private static final Logger logger = Logger.getLogger(UnitsGatheringArea.class);
+ private static final Logger logger = LogManager.getLogger(UnitsGatheringArea.class);
private static final boolean DEBUG = false;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.api.service.ITermService;
*/
public class UnitsGatheringEvent {
- private static final Logger logger = Logger.getLogger(UnitsGatheringEvent.class);
+ private static final Logger logger = LogManager.getLogger(UnitsGatheringEvent.class);
private static final boolean DEBUG = false;
private final GatheringEvent gatheringEvent = GatheringEvent.NewInstance();
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.specimen.SpecimenDataHolder;\r
\r
*/\r
public class Abcd206DataHolder extends SpecimenDataHolder{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(Abcd206DataHolder.class);\r
+ private static final Logger logger = LogManager.getLogger(Abcd206DataHolder.class);\r
\r
//per import\r
\r
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
private static final UUID SPECIMEN_SCAN_TERM = UUID.fromString("acda15be-c0e2-4ea8-8783-b9b0c4ad7f03");
- private static final Logger logger = Logger.getLogger(Abcd206Import.class);
+ private static final Logger logger = LogManager.getLogger(Abcd206Import.class);
public Abcd206Import() {
super();
\r
import java.io.InputStream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.common.UriUtils;\r
private static final long serialVersionUID = -7204105522522645681L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(Abcd206ImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(Abcd206ImportConfigurator.class);\r
\r
\r
//TODO\r
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
*/
public class Abcd206ImportParser {
- private static final Logger logger = Logger.getLogger(Abcd206ImportParser.class);
+ private static final Logger logger = LogManager.getLogger(Abcd206ImportParser.class);
/**
* Store the unit's properties into variables Look which unit is the
* preferred one Look what kind of name it is supposed to be, for the
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.specimen.SpecimenImportStateBase;
extends SpecimenImportStateBase<Abcd206ImportConfigurator, Abcd206ImportState>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Abcd206ImportState.class);
+ private static final Logger logger = LogManager.getLogger(Abcd206ImportState.class);
private String prefix;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class Abcd206XMLFieldGetter {
- private static final Logger logger = Logger.getLogger(Abcd206Import.class);
+ private static final Logger logger = LogManager.getLogger(Abcd206Import.class);
private final Abcd206DataHolder dataHolder;
private final String prefix;
private String path = "";
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
*/
public class AbcdParseUtility {
- private static final Logger logger = Logger.getLogger(AbcdParseUtility.class);
+ private static final Logger logger = LogManager.getLogger(AbcdParseUtility.class);
public static URI parseFirstUri(NodeList nodeList, SpecimenImportReport report){
URI uri = null;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.specimen.SpecimenImportConfiguratorBase;
*/
public class SpecimenImportReport {
- static private final Logger logger = Logger.getLogger(SpecimenImportReport.class);
+ static private final Logger logger = LogManager.getLogger(SpecimenImportReport.class);
private final List<Taxon> createdTaxa = new ArrayList<>();
import java.util.Set;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Element;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
*/
public class UnitAssociationParser {
- private static final Logger logger = Logger.getLogger(UnitAssociationParser.class);
+ private static final Logger logger = LogManager.getLogger(UnitAssociationParser.class);
private final String prefix;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
private static final String REVERSE = "reverse";
- private static final Logger logger = Logger.getLogger(AbcdGgbnParser.class);
+ private static final Logger logger = LogManager.getLogger(AbcdGgbnParser.class);
private final String prefix = "ggbn:";
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = -6812740621254308971L;
- private static final Logger logger = Logger.getLogger(ExtensionTypeExcelImport.class);
+ private static final Logger logger = LogManager.getLogger(ExtensionTypeExcelImport.class);
private static final String WORKSHEET_NAME = "ExtensionTypes";
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = 6790172880945153291L;
- private static final Logger logger = Logger.getLogger(NamedAreaLevelExcelImport.class);
+ private static final Logger logger = LogManager.getLogger(NamedAreaLevelExcelImport.class);
private static final String WORKSHEET_NAME = "AreaLevels";
import java.util.TreeMap;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
\r
*/\r
public class NamedAreaLevellRow {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NamedAreaLevellRow.class);\r
+ private static final Logger logger = LogManager.getLogger(NamedAreaLevellRow.class);\r
\r
private UUID uuid = null; \r
private String label = null;\r
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
implements ICdmIO<SpecimenCdmExcelImportState> {
private static final long serialVersionUID = 5489033387543936839L;
- private static final Logger logger = Logger.getLogger(SpecimenCdmExcelImport.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenCdmExcelImport.class);
private static final String WORKSHEET_NAME = "Specimen";
\r
import eu.etaxonomy.cdm.common.URI;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.CdmImportBase.TermMatchMode;\r
*/\r
public class SpecimenCdmExcelImportConfigurator extends ExcelImportConfiguratorBase implements IImportConfigurator {\r
private static final long serialVersionUID = -114046010543496409L;\r
- private static final Logger logger = Logger.getLogger(SpecimenCdmExcelImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenCdmExcelImportConfigurator.class);\r
private static IInputTransformer defaultTransformer = new SpecimenCdmExcelTransformer();\r
\r
//old\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelImportState;\r
import eu.etaxonomy.cdm.model.agent.Person;\r
*/\r
public class SpecimenCdmExcelImportState extends ExcelImportState<SpecimenCdmExcelImportConfigurator, SpecimenRow>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SpecimenCdmExcelImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenCdmExcelImportState.class);\r
\r
private SpecimenRow specimenRow;\r
private NamedAreaLevellRow namedAreaLevelRow;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
*/\r
public final class SpecimenCdmExcelTransformer extends InputTransformerBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SpecimenCdmExcelTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenCdmExcelTransformer.class);\r
\r
public static final UUID uuidRefSysEstimated = UUID.fromString("3b625520-e5cf-4d9c-9599-0cb048e0e8d2");\r
public static final UUID uuidRefSysLabel = UUID.fromString("c72335ed-c9aa-4d1c-b6fc-9f307d207862");\r
import java.util.TreeMap;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;\r
import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
*/\r
public class SpecimenRow extends ExcelRowBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SpecimenRow.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenRow.class);\r
\r
private String basisOfRecord;\r
\r
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
* @version 1.0\r
*/\r
public class SpecimenSynthesysExcelImportConfigurator extends ImportConfiguratorBase<SpecimenSynthesysExcelImportState, URI> implements IImportConfigurator {\r
- private static final Logger logger = Logger.getLogger(SpecimenSynthesysExcelImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenSynthesysExcelImportConfigurator.class);\r
private boolean doParsing = false;\r
private boolean reuseMetadata = false;\r
private boolean reuseTaxon = false;\r
\r
package eu.etaxonomy.cdm.io.specimen.excel.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
*/\r
public class SpecimenSynthesysExcelImportState extends ImportStateBase<SpecimenSynthesysExcelImportConfigurator, CdmImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SpecimenSynthesysExcelImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(SpecimenSynthesysExcelImportState.class);\r
\r
public SpecimenSynthesysExcelImportState(SpecimenSynthesysExcelImportConfigurator config) {\r
super(config);\r
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
private static final long serialVersionUID = -1145031415387024364L;
- private static final Logger logger = Logger.getLogger(SpecimenSythesysExcelImport.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenSythesysExcelImport.class);
protected String fullScientificNameString;
protected String nomenclatureCode;
import java.util.HashMap;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
import eu.etaxonomy.cdm.io.specimen.SpecimenDataHolder;
*/
public class GbifDataHolder extends SpecimenDataHolder{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Abcd206DataHolder.class);
+ private static final Logger logger = LogManager.getLogger(Abcd206DataHolder.class);
//per import
protected List<SpecimenTypeDesignationStatus> statusList;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
*
*/
private static final long serialVersionUID = 1L;
- private static final Logger logger = Logger.getLogger(GbifImport.class);
+ private static final Logger logger = LogManager.getLogger(GbifImport.class);
@Override
protected boolean doCheck(SpecimenImportStateBase<SpecimenImportConfiguratorBase, SpecimenImportStateBase> state) {
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import au.com.bytecode.opencsv.CSVReader;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = -4828538731087241715L;
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(CsvStream.class);
+ private static Logger logger = LogManager.getLogger(CsvStream.class);
private final CSVReader csvReader;
private final ArchiveEntryBase archiveEntry;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.events.IIoObserver;
import eu.etaxonomy.cdm.io.stream.terms.TermUri;
*/
public class FilteredStream implements IItemStream {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(FilteredStream.class);
+ private static Logger logger = LogManager.getLogger(FilteredStream.class);
private final IItemStream reader;
private final ItemFilter<StreamItem> filter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* ListReader wraps a list to implement IReader.
*/
public class ListReader<TYPE extends Object> implements IReader<TYPE> {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(ListReader.class);
+ private static Logger logger = LogManager.getLogger(ListReader.class);
private final List<TYPE> list;
private int index = 0;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.stream.terms.TermUri;
*/
public class LookAheadStream<ITEM> implements INamespaceReader<ITEM>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(LookAheadStream.class);
+ private static final Logger logger = LogManager.getLogger(LookAheadStream.class);
private final Queue<ITEM> fifo = new LinkedBlockingQueue<>();
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.events.IIoEvent;
import eu.etaxonomy.cdm.io.common.events.IIoObserver;
public abstract class PartitionableConverterBase<CONFIG extends DwcaDataImportConfiguratorBase, STATE extends StreamImportStateBase<CONFIG,StreamImportBase>>
implements IPartitionableConverter<StreamItem, IReader<CdmBase>, String> {
- private static final Logger logger = Logger.getLogger(PartitionableConverterBase.class);
+ private static final Logger logger = LogManager.getLogger(PartitionableConverterBase.class);
protected STATE state;
protected CONFIG config; //for convenience only (must always be same as state.getConfig())
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.service.IIdentifiableEntityService;
extends CdmImportBase<CONFIG, STATE>{
private static final long serialVersionUID = -125414263689509881L;
- private static final Logger logger = Logger.getLogger(StreamImportBase.class);
+ private static final Logger logger = LogManager.getLogger(StreamImportBase.class);
protected void makeSourceRef(STATE state) {
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
private static final long serialVersionUID = 4200675007263433594L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(StreamImportConfiguratorBase.class);
+ private static final Logger logger = LogManager.getLogger(StreamImportConfiguratorBase.class);
//partitions
private boolean usePartitions = true;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IIdentifiableEntityService;
import eu.etaxonomy.cdm.io.common.ImportStateBase;
*/
public abstract class StreamImportStateBase<CONFIG extends StreamImportConfiguratorBase, IO extends StreamImportBase>
extends ImportStateBase<CONFIG, IO>{
- private static final Logger logger = Logger.getLogger(StreamImportStateBase.class);
+ private static final Logger logger = LogManager.getLogger(StreamImportStateBase.class);
private UUID uuid = UUID.randomUUID();
\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.stream.terms.TermUri;\r
*/\r
public class StreamItem implements IConverterInput<StreamItem> {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(StreamItem.class);\r
+ private static Logger logger = LogManager.getLogger(StreamItem.class);\r
\r
public TermUri term;\r
public Map<String, String> map;\r
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.stream.mapping.IImportMapping;
import eu.etaxonomy.cdm.io.stream.mapping.InMemoryMapping;
*/
public class StreamPartitioner<ITEM extends IConverterInput>
implements INamespaceReader<IReader<MappedCdmBase<? extends CdmBase>>>{
- private static final Logger logger = Logger.getLogger(StreamPartitioner.class);
+ private static final Logger logger = LogManager.getLogger(StreamPartitioner.class);
private final int partitionSize;
private final LookAheadStream<ITEM> inStream;
import eu.etaxonomy.cdm.common.URI;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.springframework.stereotype.Component;
private static final long serialVersionUID = -1067536880817966304L;
- private static final Logger logger = Logger.getLogger(ExcelStreamImport.class);
+ private static final Logger logger = LogManager.getLogger(ExcelStreamImport.class);
@Override
import java.io.InputStream;
import eu.etaxonomy.cdm.common.URI;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.database.ICdmDataSource;
private static final long serialVersionUID = 5093164389086186710L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExcelStreamImportConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(ExcelStreamImportConfigurator.class);
private static final String DEFAULT_REF_TITLE = "Excel Stream Import";
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
*
*/
public class DatabaseMapping implements IImportMapping {
- private static final Logger logger = Logger.getLogger(DatabaseMapping.class);
+ private static final Logger logger = LogManager.getLogger(DatabaseMapping.class);
private static final String DATABASE_INTERNAL_IMPORT_MAPPING = "_internalImportMapping";
protected static final String TABLE_IMPORT_MAPPING = "importmapping";
import java.net.URISyntaxException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermUri.class);
+ private static final Logger logger = LogManager.getLogger(TermUri.class);
private URI uri;
\r
package eu.etaxonomy.cdm.io.taxonx;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
import eu.etaxonomy.cdm.model.common.Language;\r
* @version 1.0\r
*/\r
public class SimpleSpecimen {\r
- private static final Logger logger = Logger.getLogger(SimpleSpecimen.class);\r
+ private static final Logger logger = LogManager.getLogger(SimpleSpecimen.class);\r
\r
private GatheringEvent gatheringEvent;\r
private FieldUnit fieldUnit;\r
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Attribute;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
extends CdmImportBase<TaxonXImportConfigurator, TaxonXImportState> {\r
\r
private static final long serialVersionUID = 1957356490206741364L;\r
- private static final Logger logger = Logger.getLogger(TaxonXDescriptionImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXDescriptionImport.class);\r
\r
public TaxonXDescriptionImport(){\r
super();\r
import eu.etaxonomy.cdm.common.URI;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
\r
import eu.etaxonomy.cdm.common.XmlHelp;\r
* @version 1.0\r
*/\r
public class TaxonXImportConfigurator extends ImportConfiguratorBase<TaxonXImportState, URI> implements IImportConfigurator {\r
- private static final Logger logger = Logger.getLogger(TaxonXImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXImportConfigurator.class);\r
\r
//if true the information in the mods part (taxonxHeader)\r
private boolean doMods = true;\r
\r
package eu.etaxonomy.cdm.io.taxonx;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
*/\r
public class TaxonXImportState extends ImportStateBase<TaxonXImportConfigurator, CdmImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonXImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXImportState.class);\r
\r
private Reference modsReference;\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
public class TaxonXModsImport extends CdmImportBase<TaxonXImportConfigurator, TaxonXImportState>{\r
\r
private static final long serialVersionUID = -4778280393567013855L;\r
- private static final Logger logger = Logger.getLogger(TaxonXModsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXModsImport.class);\r
\r
@SuppressWarnings("unused")\r
private static int modCount = 10000;\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
extends CdmImportBase<TaxonXImportConfigurator, TaxonXImportState> {\r
\r
private static final long serialVersionUID = 796115831082828758L;\r
- private static final Logger logger = Logger.getLogger(TaxonXNomenclatureImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXNomenclatureImport.class);\r
\r
@SuppressWarnings("unused")\r
private static int modCount = 10000;\r
\r
package eu.etaxonomy.cdm.io.taxonx;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
import eu.etaxonomy.cdm.model.description.Feature;\r
*/\r
public final class TaxonXTransformer {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonXTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXTransformer.class);\r
\r
//Facts\r
public static int FACT_DESCRIPTION = 1;\r
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
private TaxonXImport importer;
private TaxonXImportState configState;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonXAddSources.class);
+ private static final Logger logger = LogManager.getLogger(TaxonXAddSources.class);
/**
* @param importer
import java.util.ArrayList;\r
import java.util.HashMap;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
\r
*/\r
public class TaxonXDataHolder {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonXDataHolder.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXDataHolder.class);\r
\r
\r
protected String atomisedStr;\r
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
private final Map<String,String> namesAsked = new HashMap<>();
private final Map<String,Rank>ranksAsked = new HashMap<>();
- Logger logger = Logger.getLogger(TaxonXExtractor.class);
+ Logger logger = LogManager.getLogger(TaxonXExtractor.class);
public class ReferenceBuilder{
private int nbRef=0;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
import org.w3c.dom.Document;
extends CdmImportBase<TaxonXImportConfigurator, TaxonXImportState>{
private static final long serialVersionUID = 8166758191513137605L;
- private static final Logger logger = Logger.getLogger(TaxonXImport.class);
+ private static final Logger logger = LogManager.getLogger(TaxonXImport.class);
private static String prefix = "";
public static String LOG_FOLDER = "C:\\Users\\pesiimport\\.cdmLibrary\\log\\taxonX\\";
import java.util.Map;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;\r
\r
private static final long serialVersionUID = -7607808010688414010L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonXImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXImportConfigurator.class);\r
\r
private String defaultImportClassification = null;\r
//if true the information in the mods part (taxonxHeader)\r
\r
package eu.etaxonomy.cdm.io.taxonx2013;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
extends ImportStateBase<TaxonXImportConfigurator, CdmImportBase<TaxonXImportConfigurator , TaxonXImportState >>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonXImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonXImportState.class);\r
\r
public TaxonXImportState(TaxonXImportConfigurator config) {\r
super(config);\r
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
private final Map<String,UUID> personMap = new HashMap<String, UUID>();
- private final Logger logger = Logger.getLogger(getClass());
+ private final Logger logger = LogManager.getLogger(getClass());
private final String AUTHOR = "author";
import javax.xml.transform.TransformerFactoryConfigurationError;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
private static final String PUBLICATION_YEAR = "publicationYear";
- private static final Logger logger = Logger.getLogger(TaxonXTreatmentExtractor.class);
+ private static final Logger logger = LogManager.getLogger(TaxonXTreatmentExtractor.class);
private static final String notMarkedUp = "Not marked-up";
private static final UUID proIbioTreeUUID = UUID.fromString("2c49f506-c7f7-44de-a8b9-2e695de3769c");
import eu.etaxonomy.cdm.common.URI;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class TaxonXXMLFieldGetter {
- private static final Logger logger = Logger.getLogger(TaxonXXMLFieldGetter.class);
+ private static final Logger logger = LogManager.getLogger(TaxonXXMLFieldGetter.class);
private final Document doc;
\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
public class CdmOneToManyXmlMapper<ONE extends CdmBase, MANY extends CdmBase, SINGLE_MAPPER extends CdmSingleAttributeXmlMapperBase> extends\r
CdmOneToManyMapper<ONE, MANY, SINGLE_MAPPER> implements IXmlMapper{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmOneToManyXmlMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmOneToManyXmlMapper.class);\r
\r
public CdmOneToManyXmlMapper(Class<ONE> oneClass, Class<MANY> manyClass, String singleAttributeName, SINGLE_MAPPER[] singleAttributesMappers) {\r
super(oneClass, manyClass, singleAttributeName, singleAttributesMappers);\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
\r
import com.hp.hpl.jena.rdf.model.Resource;\r
\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmSingleAttributeXmlMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmSingleAttributeXmlMapperBase.class);\r
\r
protected String sourceNameSpace;\r
\r
\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import com.hp.hpl.jena.rdf.model.Resource;\r
import com.hp.hpl.jena.rdf.model.Statement;\r
\r
public class CdmTextElementMapper extends CdmSingleAttributeRDFMapperBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmTextElementMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmTextElementMapper.class);\r
\r
/**\r
* @param dbValue\r
\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import com.hp.hpl.jena.rdf.model.Resource;\r
import com.hp.hpl.jena.rdf.model.Statement;\r
public class CdmUnclearMapper extends CdmSingleAttributeRDFMapperBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmUnclearMapper.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmUnclearMapper.class);\r
\r
/**\r
* @param dbValue\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Text;\r
public abstract class TcsRdfImportBase extends CdmImportBase<TcsRdfImportConfigurator, TcsRdfImportState> {\r
private static final long serialVersionUID = -8765093240068562907L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfImportBase.class);\r
\r
protected static String nsTcom = "http://rs.tdwg.org/ontology/voc/Common#";\r
protected static String nsTn = "http://rs.tdwg.org/ontology/voc/TaxonName#";\r
import java.net.URL;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
private static final long serialVersionUID = -8987364078779275820L;\r
\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfImportConfigurator.class);\r
\r
\r
//TODO\r
\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
\r
*/\r
public class TcsRdfImportState extends ImportStateBase<TcsRdfImportConfigurator, TcsRdfImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TcsRdfImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfImportState.class);\r
\r
public TcsRdfImportState(TcsRdfImportConfigurator config) {\r
super(config);\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
\r
\r
private static final long serialVersionUID = -2441804641147165510L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfReferenceImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfReferenceImport.class);\r
\r
private static int modCount = 1000;\r
\r
import java.util.Iterator;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Attribute;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
public class TcsRdfTaxonImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {\r
private static final long serialVersionUID = 4615869699069336295L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfTaxonImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfTaxonImport.class);\r
\r
private static int modCount = 30000;\r
\r
import java.io.InputStream;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.Namespace;
public class TcsRdfTaxonNameImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {
private static final long serialVersionUID = -2547422867292051979L;
- private static final Logger logger = Logger.getLogger(TcsRdfTaxonNameImport.class);
+ private static final Logger logger = LogManager.getLogger(TcsRdfTaxonNameImport.class);
private static int modCount = 5000;
import java.util.HashSet;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
\r
public class TcsRdfTaxonNameRelationsImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {\r
private static final long serialVersionUID = 3886480984730604589L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfTaxonNameRelationsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfTaxonNameRelationsImport.class);\r
\r
private static int modCount = 5000;\r
\r
import java.util.HashSet;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
public class TcsRdfTaxonRelationsImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {\r
private static final long serialVersionUID = 7473543276142564219L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsRdfTaxonRelationsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfTaxonRelationsImport.class);\r
\r
private static int modCount = 30000;\r
\r
\r
package eu.etaxonomy.cdm.io.tcsrdf;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
*/\r
public final class TcsRdfTransformer {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TcsRdfTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsRdfTransformer.class);\r
\r
\r
//TypeDesignation\r
*/\r
package eu.etaxonomy.cdm.io.tcsxml;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
public abstract class CdmSingleAttributeXmlMapperBase extends CdmSingleAttributeMapperBase implements IXmlMapper{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmSingleAttributeXmlMapperBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmSingleAttributeXmlMapperBase.class);\r
\r
protected Namespace sourceNamespace;\r
\r
\r
package eu.etaxonomy.cdm.io.tcsxml;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
* @version 1.0\r
*/\r
public class DefaultTcsXmlPlaceholders implements ITcsXmlPlaceholderClass {\r
- private static final Logger logger = Logger.getLogger(DefaultTcsXmlPlaceholders.class);\r
+ private static final Logger logger = LogManager.getLogger(DefaultTcsXmlPlaceholders.class);\r
\r
/* (non-Javadoc)\r
* @see tcsxml.ITcsXmlPlaceholderClass#makeMetaDataDetailed(tcsxml.TcsXmlImportConfigurator, org.jdom.Element)\r
\r
package eu.etaxonomy.cdm.io.tcsxml;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.ResultWrapper;\r
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
\r
public final class TcsXmlTransformer {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TcsXmlTransformer.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlTransformer.class);\r
\r
\r
//TypeDesignation\r
\r
package eu.etaxonomy.cdm.io.tcsxml.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
\r
import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;\r
@Component\r
public class CdmTcsXmlImport extends CdmApplicationAwareDefaultImport<TcsXmlImportConfigurator> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmTcsXmlImport.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmTcsXmlImport.class);\r
\r
}\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
public abstract class TcsXmlImportBase extends CdmImportBase<TcsXmlImportConfigurator, TcsXmlImportState> {\r
private static final long serialVersionUID = -2169244092211698392L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsXmlImportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlImportBase.class);\r
\r
protected static Namespace nsTcom = Namespace.getNamespace("http://rs.tdwg.org/ontology/voc/Common#");\r
protected static Namespace nsTn = Namespace.getNamespace("http://rs.tdwg.org/ontology/voc/TaxonName#");\r
import java.net.MalformedURLException;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
\r
@Component\r
public class TcsXmlImportConfigurator extends ImportConfiguratorBase<TcsXmlImportState, URI> implements IImportConfigurator {\r
- private static final Logger logger = Logger.getLogger(TcsXmlImportConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlImportConfigurator.class);\r
\r
//TODO\r
private static IInputTransformer defaultTransformer = null;\r
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
*/\r
public class TcsXmlImportState extends ImportStateBase<TcsXmlImportConfigurator, TcsXmlImportBase>{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TcsXmlImportState.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlImportState.class);\r
\r
//TODO make it better\r
private Map<String, CommonTaxonName> commonNameMap = null;\r
\r
package eu.etaxonomy.cdm.io.tcsxml.in;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
*/\r
@Component\r
public class TcsXmlMetaDataImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {\r
- private static final Logger logger = Logger.getLogger(TcsXmlMetaDataImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlMetaDataImport.class);\r
\r
private static int modCount = 1000;\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
*/\r
@Component\r
public class TcsXmlPublicationsImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {\r
- private static final Logger logger = Logger.getLogger(TcsXmlPublicationsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlPublicationsImport.class);\r
\r
private static int modCount = 1000;\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.stereotype.Component;\r
*/\r
@Component\r
public class TcsXmlSpecimensImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {\r
- private static final Logger logger = Logger.getLogger(TcsXmlSpecimensImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlSpecimensImport.class);\r
\r
private static int modCount = 1000;\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Attribute;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
*/\r
@Component\r
public class TcsXmlTaxonImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {\r
- private static final Logger logger = Logger.getLogger(TcsXmlTaxonImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlTaxonImport.class);\r
\r
private static int modCount = 30000;\r
\r
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import org.jdom.Namespace;
import org.springframework.stereotype.Component;
public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {
private static final long serialVersionUID = -1978871518114999061L;
- private static final Logger logger = Logger.getLogger(TcsXmlTaxonNameImport.class);
+ private static final Logger logger = LogManager.getLogger(TcsXmlTaxonNameImport.class);
private static int modCount = 5000;
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Content;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
\r
private static final long serialVersionUID = 4000887401260650783L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsXmlTaxonNameRelationsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlTaxonNameRelationsImport.class);\r
\r
private static int modCount = 5000;\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.jdom.Namespace;\r
import org.springframework.beans.factory.annotation.Autowired;\r
public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdmIO<TcsXmlImportState> {\r
private static final long serialVersionUID = 6632990505515905663L;\r
\r
- private static final Logger logger = Logger.getLogger(TcsXmlTaxonRelationsImport.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlTaxonRelationsImport.class);\r
\r
private static int modCount = 30000;\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.io.common.CdmExportBase;\r
import eu.etaxonomy.cdm.io.common.Source;\r
extends CdmExportBase<TcsXmlExportConfigurator, TcsXmlExportState, IExportTransformer, File> {\r
\r
private static final long serialVersionUID = -7100332849797374995L;\r
- private static final Logger logger = Logger.getLogger(TcsXmlExportBase.class);\r
+ private static final Logger logger = LogManager.getLogger(TcsXmlExportBase.class);\r
\r
public TcsXmlExportBase() {\r
super();\r
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;
private static final long serialVersionUID = 2943494702785912481L;
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(TcsXmlExportConfigurator.class);
+ private static Logger logger = LogManager.getLogger(TcsXmlExportConfigurator.class);
private TcsXmlExportState state;
package eu.etaxonomy.cdm.io.tcsxml.out;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.io.common.XmlExportState;
public class TcsXmlExportState extends XmlExportState<TcsXmlExportConfigurator>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TcsXmlExportState.class);
+ private static final Logger logger = LogManager.getLogger(TcsXmlExportState.class);
public TcsXmlExportState(TcsXmlExportConfigurator config) {
super(config);
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import au.com.bytecode.opencsv.CSVReader;
extends SimpleImport<RepresentationCsvImportConfigurator, File>{
private static final long serialVersionUID = -5600766240192189822L;
- private static Logger logger = Logger.getLogger(RepresentationCsvImport.class);
+ private static Logger logger = LogManager.getLogger(RepresentationCsvImport.class);
@Override
protected void doInvoke(RepresentationCsvImportConfigurator config) {
import java.util.HashSet;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
public class Cdm2CdmVocabularyImportTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Cdm2CdmVocabularyImportTest.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2CdmVocabularyImportTest.class);
private static CdmApplicationController otherRepository;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class CdmLightExportTest extends CdmTransactionalIntegrationTest{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmLightExportTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmLightExportTest.class);
@SpringBeanByName
private CdmApplicationAwareDefaultExport<CdmLightExportConfigurator> defaultExport;
import java.net.URISyntaxException;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class DwcaImportIntegrationTest extends CdmTransactionalIntegrationTest{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaImportIntegrationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaImportIntegrationTest.class);\r
\r
@SpringBeanByName\r
private CdmApplicationAwareDefaultImport<?> defaultImport;\r
import java.io.IOException;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class DwcaZipToStreamConverterTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DwcaZipToStreamConverterTest.class);\r
+ private static final Logger logger = LogManager.getLogger(DwcaZipToStreamConverterTest.class);\r
\r
private URI uri;\r
private DwcaZipToStreamConverter<?> converter;\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class DwcaExportTest extends CdmTransactionalIntegrationTest{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DwcaExportTest.class);
+ private static final Logger logger = LogManager.getLogger(DwcaExportTest.class);
private static final UUID UUID_SUBSPEC_NODE = UUID.fromString("f8c9933a-fe3a-42ce-8a92-000e27bfdfac");
private static final String UUID_UNPUBLISHED_TAXON = "e5cdc392-4e0b-49ad-84e9-8c4b22d1827c";
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
*/
public class ExcelStreamImportTest extends CdmTransactionalIntegrationTest{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExcelStreamImportTest.class);
+ private static final Logger logger = LogManager.getLogger(ExcelStreamImportTest.class);
@SpringBeanByName
CdmApplicationAwareDefaultImport<?> defaultImport;
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class NormalExplicitImportTest extends CdmTransactionalIntegrationTest{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NormalExplicitImportTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NormalExplicitImportTest.class);\r
\r
@SpringBeanByName\r
CdmApplicationAwareDefaultImport<?> defaultImport;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.spring.annotation.SpringBeanByName;
*/
public class OwlExportTest extends CdmTransactionalIntegrationTest{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OwlExportTest.class);
+ private static final Logger logger = LogManager.getLogger(OwlExportTest.class);
@SpringBeanByName
private CdmApplicationAwareDefaultExport<StructureTreeOwlExportConfigurator> defaultExport;
import java.net.URL;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Level;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Ignore;\r
/**\r
* @author l.morris\r
* @since 14 Nov 2012\r
- *\r
*/\r
public class SDDImportExportTest extends CdmTransactionalIntegrationTest {\r
\r
\r
//logger.setLevel(Level.DEBUG);\r
commitAndStartNewTransaction(new String[]{"DEFINEDTERMBASE"});\r
- logger.setLevel(Level.DEBUG);\r
\r
logger.debug("Name count: " + (nameService.count(null)));\r
logger.debug("Classification count: " + (classificationService.count(Classification.class)));\r
assertEquals("Number of TaxonNames should be 1", 1, nameService.count(null));\r
}\r
\r
- /**\r
- * @param loadedDataSource\r
- * @return\r
- */\r
private ICdmDataSource customDataSource() {\r
\r
CdmPersistentDataSource loadedDataSource = null;\r
import java.sql.SQLException;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
*
*/
public class DatabaseMappingTest {
- private static final Logger logger = Logger.getLogger(DatabaseMappingTest.class);
+ private static final Logger logger = LogManager.getLogger(DatabaseMappingTest.class);
private DatabaseMapping mapping;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
private final int MAX_ROWS = 60000;
private final int MAX_TABLES = 150;
- private static final Logger logger = Logger.getLogger(TestCdmDbComparator.class);
+ private static final Logger logger = LogManager.getLogger(TestCdmDbComparator.class);
private static final String[] table_list = {
// "Address",
*/\r
package eu.etaxonomy.cdm.test.suite;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.runner.RunWith;\r
import org.junit.runners.Suite;\r
\r
)\r
public class CdmTestSuite {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmTestSuite.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmTestSuite.class);\r
\r
// the class remains completely empty,\r
// being used only as a holder for the above annotations\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
package eu.etaxonomy.cdm.aspectj;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.aspectj.lang.Signature;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.ICdmBase;
* CdmBase defines the rest of the ProeprtyChangeSupport like listener registration
*/
public aspect PropertyChangeAspect {
- static Logger logger = Logger.getLogger(PropertyChangeAspect.class);
+
+ static Logger logger = LogManager.getLogger(PropertyChangeAspect.class);
// pointcut execAdder(CdmBase cb): target(cb) && execution(void CdmBase+.add*(..) ); //once implemented we may want to remove addToSetWithChangeEvent and remove... from CdmBase
// pointcut callSetter( CdmBase b ) : call( * CdmBase+.set*(..) ) && target( b );
-
/**
* @param cb
* Around aspect that will be weaven into the original setter methods of the CdmBase derived classes
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
public class HomotypicGroupTaxonComparator extends TaxonComparator {
private static final long serialVersionUID = -5088210641256430878L;
- private static final Logger logger = Logger.getLogger(HomotypicGroupTaxonComparator.class);
+ private static final Logger logger = LogManager.getLogger(HomotypicGroupTaxonComparator.class);
private final TaxonBase<?> firstTaxonInGroup;
private final TaxonName firstNameInGroup;
import java.util.Comparator;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
private static final long serialVersionUID = -1433623743189043446L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonComparator.class);
+ private static final Logger logger = LogManager.getLogger(TaxonComparator.class);
final private boolean includeRanks;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.AbstractStringComparator;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final String HYBRID_SIGN = UTF8.HYBRID.toString();
- private static final Logger logger = Logger.getLogger(TaxonNodeByNameComparator.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeByNameComparator.class);
private boolean ignoreHybridSign = true;
private boolean sortInfraGenericFirst = true;
import java.util.Comparator;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.TermBase;
*/
public class TermLanguageComparator<T extends TermBase> implements Comparator<T> {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(TermLanguageComparator.class);
+ private static Logger logger = LogManager.getLogger(TermLanguageComparator.class);
private final Language defaultLanguage;
private final Language compareLanguage;
import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.format.CdmFormatterBase;
import eu.etaxonomy.cdm.model.agent.Person;
private static final long serialVersionUID = -6263443499465634548L;
- private static final Logger logger = Logger.getLogger(NomenclaturalSourceFormatter.class);
+ private static final Logger logger = LogManager.getLogger(NomenclaturalSourceFormatter.class);
private static final String EMPTY_TITLE = "-";
private static final String beforeMicroReference = ": ";
import java.sql.SQLException;\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.engine.spi.SharedSessionContractImplementor;\r
import org.hibernate.type.StandardBasicTypes;\r
private static final long serialVersionUID = 2227841000128722278L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DOIUserType.class);\r
+ private static final Logger logger = LogManager.getLogger(DOIUserType.class);\r
\r
private static final int[] SQL_TYPES = { Types.VARCHAR };\r
\r
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.type.StandardBasicTypes;
private static final long serialVersionUID = 1060802925284271666L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(EnumSetUserType.class);
+ private static final Logger logger = LogManager.getLogger(EnumSetUserType.class);
private static final String SEP = "#";
import java.sql.Types;\r
import java.util.Properties;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.engine.spi.SharedSessionContractImplementor;\r
import org.hibernate.type.StandardBasicTypes;\r
\r
private static final long serialVersionUID = 4641078915907621907L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(EnumUserType.class);\r
+ private static final Logger logger = LogManager.getLogger(EnumUserType.class);\r
\r
private static final int[] SQL_TYPES = { Types.VARCHAR };\r
\r
import java.util.Collection;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
/**
*/
public class HHH_9751_Util {
- private static final Logger logger = Logger.getLogger(HHH_9751_Util.class);
+ private static final Logger logger = LogManager.getLogger(HHH_9751_Util.class);
/**
* @param collection
import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.proxy.HibernateProxy;
public class HibernateProxyHelper {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(HibernateProxyHelper.class);
+ private static final Logger logger = LogManager.getLogger(HibernateProxyHelper.class);
// ************************** Hibernate proxies *******************/
/**
import java.sql.SQLException;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.type.StandardBasicTypes;
private static final long serialVersionUID = -1274015438727972344L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OrcidUserType.class);
+ private static final Logger logger = LogManager.getLogger(OrcidUserType.class);
private static final int[] SQL_TYPES = { Types.VARCHAR };
import java.sql.SQLException;\r
import java.sql.Types;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.engine.spi.SharedSessionContractImplementor;\r
import org.hibernate.type.StandardBasicTypes;\r
public class PartialUserType extends AbstractUserType implements UserType /* extends AbstractSingleColumnUserType<Partial, String, ColumnMapper<Partial,String>> implements UserType */ {\r
private static final long serialVersionUID = -5323104403077597869L;\r
\r
- private static final Logger logger = Logger.getLogger(PartialUserType.class);\r
+ private static final Logger logger = LogManager.getLogger(PartialUserType.class);\r
\r
//not required\r
public final static PartialUserType INSTANCE = new PartialUserType();\r
import java.sql.SQLException;
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.type.StandardBasicTypes;
public class ShiftUserType extends AbstractUserType implements UserType {
private static final long serialVersionUID = -2507496252811101383L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ShiftUserType.class);
+ private static final Logger logger = LogManager.getLogger(ShiftUserType.class);
private static final String SHIFT_SEPARATOR = ";";
private static final String ATTR_SEPARATOR = ",";
import java.sql.Types;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.engine.spi.SharedSessionContractImplementor;\r
import org.hibernate.type.StandardBasicTypes;\r
static final long serialVersionUID = -3959049831344758708L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(UUIDUserType.class);\r
+ private static final Logger logger = LogManager.getLogger(UUIDUserType.class);\r
\r
private static final int[] SQL_TYPES = { Types.VARCHAR };\r
\r
*/
package eu.etaxonomy.cdm.hibernate.search;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedDocValuesField;
public static final String GROUPBY_TAXON_FIELD = "groupby_taxon.id__sort";
- public static final Logger logger = Logger.getLogger(GroupByTaxonClassBridge.class);
+ public static final Logger logger = LogManager.getLogger(GroupByTaxonClassBridge.class);
public GroupByTaxonClassBridge() {
super();
*/
package eu.etaxonomy.cdm.hibernate.search;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
*/
public class IdFieldOptions implements LuceneOptions {
- private static final Logger logger = Logger.getLogger(IdFieldOptions.class);
+ private static final Logger logger = LogManager.getLogger(IdFieldOptions.class);
@Override
public Store getStore() {
*/
package eu.etaxonomy.cdm.hibernate.search;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.DocValuesType;
*/
public class LuceneDocumentUtility {
- public static final Logger logger = Logger.getLogger(LuceneDocumentUtility.class);
+ public static final Logger logger = LogManager.getLogger(LuceneDocumentUtility.class);
public static void setOrReplaceDocValueField(Field field, Document document) {
package eu.etaxonomy.cdm.hibernate.search;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedDocValuesField;
private static final char PAD_CHAR = '0';
- public static final Logger logger = Logger.getLogger(NomenclaturalSortOrderBrigde.class);
+ public static final Logger logger = LogManager.getLogger(NomenclaturalSortOrderBrigde.class);
final static int MAX_FIELD_LENGTH = 50; // used to pab the strings, should be 255 set to 50 for debugging FIXME
public final static String NAME_SORT_FIELD_NAME = "nomenclaturalOrder__sort";
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
*/
public class TaxonRelationshipClassBridge extends AbstractClassBridge {
- public static final Logger logger = Logger.getLogger(TaxonRelationshipClassBridge.class);
+ public static final Logger logger = LogManager.getLogger(TaxonRelationshipClassBridge.class);
private static final String FROM = ".from.";
private static final String TO = ".to.";
package eu.etaxonomy.cdm.jaxb;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.hibernate.proxy.HibernateProxy;
public class CdmAccessor<BeanT,ValueT> extends Accessor<BeanT,ValueT> {
- private static final Logger logger = Logger.getLogger(CdmAccessor.class);
+ private static final Logger logger = LogManager.getLogger(CdmAccessor.class);
private Accessor<BeanT, ValueT> delegate;
\r
import javax.xml.bind.annotation.adapters.XmlAdapter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.format.DateTimeFormatter;\r
import org.joda.time.format.ISODateTimeFormat;\r
* @version 1.0\r
*/\r
public class DateTimeAdapter extends XmlAdapter<String, DateTime> {\r
- private static final Logger logger = Logger.getLogger(DateTimeAdapter.class);\r
+ private static final Logger logger = LogManager.getLogger(DateTimeAdapter.class);\r
\r
@Override\r
public String marshal(DateTime dateTime) throws Exception {\r
\r
import javax.xml.bind.annotation.adapters.XmlAdapter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
\r
\r
public class UUIDAdapter extends XmlAdapter<String, UUID> {\r
- private static final Logger logger = Logger.getLogger(UUIDAdapter.class);\r
+ private static final Logger logger = LogManager.getLogger(UUIDAdapter.class);\r
\r
public static String UUID_URN_PREFIX = "urn-uuid-";\r
\r
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.VersionableEntity;
public class Address extends VersionableEntity {
private static final long serialVersionUID = 682106303069088972L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Address.class);
+ private static final Logger logger = LogManager.getLogger(Address.class);
public static Address NewInstance(){
return new Address();
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 7732768617469448829L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AgentBase.class);
+ private static final Logger logger = LogManager.getLogger(AgentBase.class);
@XmlElement(name = "Contact")
@Embedded
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
@Audited
public class Contact implements Serializable, Cloneable {
private static final long serialVersionUID = -1851305307069277625L;
- private static final Logger logger = Logger.getLogger(Contact.class);
+ private static final Logger logger = LogManager.getLogger(Contact.class);
@XmlElementWrapper(name = "EmailAddresses", nillable = true)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class Institution extends AgentBase<IIdentifiableEntityCacheStrategy<Institution>> {
private static final long serialVersionUID = -951321271656955808L;
- public static final Logger logger = Logger.getLogger(Institution.class);
+ public static final Logger logger = LogManager.getLogger(Institution.class);
@XmlElement(name = "Code")
@Field
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
@Audited
public class InstitutionalMembership extends VersionableEntity implements Cloneable{
private static final long serialVersionUID = -800814712134999042L;
- public static final Logger logger = Logger.getLogger(InstitutionalMembership.class);
+ public static final Logger logger = LogManager.getLogger(InstitutionalMembership.class);
/*Time period a person belonged to the institution*/
@XmlElement(name = "Period")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
public class Person extends TeamOrPersonBase<Person>{
private static final long serialVersionUID = 4153566493065539763L;
- public static final Logger logger = Logger.getLogger(Person.class);
+ public static final Logger logger = LogManager.getLogger(Person.class);
@XmlElement(name="NomenclaturalTitle")
@Field(index=Index.YES)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.ListIndexBase;
public class Team extends TeamOrPersonBase<Team> {
private static final long serialVersionUID = 97640416905934622L;
- public static final Logger logger = Logger.getLogger(Team.class);
+ public static final Logger logger = LogManager.getLogger(Team.class);
@XmlElement(name = "ProtectedNomenclaturalTitleCache")
private boolean protectedNomenclaturalTitleCache = false;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
implements INomenclaturalAuthor {
private static final long serialVersionUID = 5216821307314001961L;
- public static final Logger logger = Logger.getLogger(TeamOrPersonBase.class);
+ public static final Logger logger = LogManager.getLogger(TeamOrPersonBase.class);
//under construction #4311
@XmlElement(name="CollectorTitleCache")
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 9151211842542443102L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AnnotatableEntity.class);
+ private static final Logger logger = LogManager.getLogger(AnnotatableEntity.class);
@XmlElementWrapper(name = "Markers", nillable = true)
@XmlElement(name = "Marker")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
private static final long serialVersionUID = -4484677078599520233L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Annotation.class);
+ private static final Logger logger = LogManager.getLogger(Annotation.class);
// ***************************** ATTRIBUTES **************************/
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.TermType;
private static final long serialVersionUID = 49629121282854575L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AnnotationType.class);
+ private static final Logger logger = LogManager.getLogger(AnnotationType.class);
protected static Map<UUID, AnnotationType> termMap = null;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
import eu.etaxonomy.cdm.model.term.IEnumTerm;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AuthorityType.class);
+ private static final Logger logger = LogManager.getLogger(AuthorityType.class);
private AuthorityType(UUID uuid, String defaultString, String key, AuthorityType parent){
import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlElement;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.name.TaxonName;
private static final long serialVersionUID = -8671887501681406910L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AvailableForIdentifiableBase.class);
+ private static final Logger logger = LogManager.getLogger(AvailableForIdentifiableBase.class);
//for hibernate use only
@Deprecated
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Parameter;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 7991846649037898325L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AvailableForTermBase.class);
+ private static final Logger logger = LogManager.getLogger(AvailableForTermBase.class);
@XmlAttribute(name ="availableFor")
@NotNull
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.NaturalId;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -3053225700018294809L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmBase.class);
+ private static final Logger logger = LogManager.getLogger(CdmBase.class);
protected static final int CLOB_LENGTH = 65536;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.description.CategoricalData;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmClass.class);
+ private static final Logger logger = LogManager.getLogger(CdmClass.class);
@SuppressWarnings("unchecked")
private CdmClass(Class<? extends CdmBase> clazz, String key, boolean isDescribed,
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class Credit extends LanguageStringBase implements Cloneable{
private static final long serialVersionUID = 5763391127298427701L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Credit.class);
+ private static final Logger logger = LogManager.getLogger(Credit.class);
// ********************** FACTORY **********************************************/
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public abstract class EventBase extends AnnotatableEntity implements IEvent {
private static final long serialVersionUID = -1859035632758446593L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(EventBase.class);
+ private static final Logger logger = LogManager.getLogger(EventBase.class);
@XmlElement(name = "TimePeriod")
private TimePeriod timeperiod = TimePeriod.NewInstance();
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
private static final long serialVersionUID = -6543644293635460526L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExtendedTimePeriod.class);
+ private static final Logger logger = LogManager.getLogger(ExtendedTimePeriod.class);
private static ExtendedTimePeriodFormatter formatter = ExtendedTimePeriodFormatter.NewDefaultInstance();
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
/**
public class Extension extends VersionableEntity implements Cloneable {
private static final long serialVersionUID = -857207737641432202L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Extension.class);
+ private static final Logger logger = LogManager.getLogger(Extension.class);
@XmlElement(name = "Value")
@Lob
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.TermType;
private static final long serialVersionUID = -7761963794004133427L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExtensionType.class);
+ private static final Logger logger = LogManager.getLogger(ExtensionType.class);
private static final UUID uuidXmlFragment = UUID.fromString("ea109c1c-e69b-4e6d-9079-1941b9ee2991");
private static final UUID uuidRdfFragment = UUID.fromString("f3684e25-dcad-4c1e-a5d8-16cddf1c4f5b");
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
import eu.etaxonomy.cdm.model.term.IEnumTerm;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExternallyManagedImport.class);
+ private static final Logger logger = LogManager.getLogger(ExternallyManagedImport.class);
private ExternallyManagedImport(UUID uuid, String defaultString, String key, ExternallyManagedImport parent){
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IIdentifiableEntity /*, ISourceable<IdentifiableSource> */ {
private static final long serialVersionUID = 7912083412108359559L;
- private static final Logger logger = Logger.getLogger(IdentifiableEntity.class);
+ private static final Logger logger = LogManager.getLogger(IdentifiableEntity.class);
@XmlTransient
public static final boolean PROTECTED = true;
import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.reference.ICdmTarget;
private static final long serialVersionUID = -8487673428764273806L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IdentifiableSource.class);
+ private static final Logger logger = LogManager.getLogger(IdentifiableSource.class);
//********************************* FACTORY ********************************************************/
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
private static final long serialVersionUID = 3337567049024506936L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Identifier.class);
+ private static final Logger logger = LogManager.getLogger(Identifier.class);
@XmlElement(name ="Identifier" )
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import au.com.bytecode.opencsv.CSVWriter;
public class Language extends DefinedTermBase<Language> {
private static final long serialVersionUID = -5030610079904074217L;
- private static final Logger logger = Logger.getLogger(Language.class);
+ private static final Logger logger = LogManager.getLogger(Language.class);
public static final UUID uuidLanguageVocabulary = UUID.fromString("45ac7043-7f5e-4f37-92f2-3874aaaef2de");
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class LanguageString extends LanguageStringBase implements Cloneable, IIntextReferencable {
private static final long serialVersionUID = -1502298496073201104L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(LanguageString.class);
+ private static final Logger logger = LogManager.getLogger(LanguageString.class);
//TODO do we need to add it to JAXB? #4706
@XmlElementWrapper(name = "IntextReferences", nillable = true)
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.FieldBridge;
private static final long serialVersionUID = -1892526642162438277L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(LanguageStringBase.class);
+ private static final Logger logger = LogManager.getLogger(LanguageStringBase.class);
@XmlElement(name = "Text")
@XmlJavaTypeAdapter(FormattedTextAdapter.class)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.validation.Level2;
public class Marker extends VersionableEntity implements Cloneable{
private static final long serialVersionUID = -7474489691871404610L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Marker.class);
+ private static final Logger logger = LogManager.getLogger(Marker.class);
@XmlElement(name = "Flag")
private boolean flag;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
public class MarkerType extends AvailableForIdentifiableBase<MarkerType> {
private static final long serialVersionUID = -9117424749919907396L;
- public static final Logger logger = Logger.getLogger(MarkerType.class);
+ public static final Logger logger = LogManager.getLogger(MarkerType.class);
private static final UUID uuidImported = UUID.fromString("96878790-4ceb-42a2-9738-a2242079b679");
private static final UUID uuidToBeChecked = UUID.fromString("34204192-b41d-4857-a1d4-28992bef2a2a");
import java.util.HashMap;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author m.doering
implements Cloneable, IMultiLanguageText {
private static final long serialVersionUID = 7876604337076705862L;
- private static final Logger logger = Logger.getLogger(MultilanguageText.class);
+ private static final Logger logger = LogManager.getLogger(MultilanguageText.class);
/**
* Factory method
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.reference.NamedSource;
private static final long serialVersionUID = -5030154633820061997L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RelationshipBase.class);
+ private static final Logger logger = LogManager.getLogger(RelationshipBase.class);
@XmlAttribute(name = "isDoubtful")
private boolean doubtful;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends OrderedTermBase<T> {
private static final long serialVersionUID = 5497187985269083971L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RelationshipTermBase.class);
+ private static final Logger logger = LogManager.getLogger(RelationshipTermBase.class);
@XmlElement(name = "Symmetrical")
@Field(analyze = Analyze.NO)
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
static final long serialVersionUID = 2035568689268762760L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SingleSourcedEntityBase.class);
+ private static final Logger logger = LogManager.getLogger(SingleSourcedEntityBase.class);
//the source for this single sourced entity
@XmlElement(name = "source")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -5614669050360359126L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SourcedEntityBase.class);
+ private static final Logger logger = LogManager.getLogger(SourcedEntityBase.class);
@XmlElementWrapper(name = "Sources")
@XmlElement(name = "Source")
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
public class TimePeriod implements Cloneable, Serializable, ICheckEmpty {
private static final long serialVersionUID = 3405969418194981401L;
- private static final Logger logger = Logger.getLogger(TimePeriod.class);
+ private static final Logger logger = LogManager.getLogger(TimePeriod.class);
public static final DateTimeFieldType YEAR_TYPE = DateTimeFieldType.year();
public static final DateTimeFieldType MONTH_TYPE = DateTimeFieldType.monthOfYear();
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.Partial;
import org.joda.time.ReadableInstant;
private static final long serialVersionUID = -6543644293635460526L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(VerbatimTimePeriod.class);
+ private static final Logger logger = LogManager.getLogger(VerbatimTimePeriod.class);
private static VerbatimTimePeriodFormatter formatter = VerbatimTimePeriodFormatter.NewDefaultInstance();
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Analyze;
private static final long serialVersionUID = 1409299200302758513L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(VersionableEntity.class);
+ private static final Logger logger = LogManager.getLogger(VersionableEntity.class);
@XmlElement(name ="Updated", type = String.class)
@XmlJavaTypeAdapter(DateTimeAdapter.class)
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class CategoricalData extends DescriptionElementBase {
private static final long serialVersionUID = -6298361966947668998L;
- private static final Logger logger = Logger.getLogger(CategoricalData.class);
+ private static final Logger logger = LogManager.getLogger(CategoricalData.class);
//whether the sequence of ordered states is important
@XmlElement(name = "OrderRelevant")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.IndexedEmbedded;
private static final long serialVersionUID = -5631282599057455256L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Feature.class);
+ private static final Logger logger = LogManager.getLogger(Feature.class);
@XmlElement(name = "Structure")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
public class CommonTaxonName extends DescriptionElementBase {
private static final long serialVersionUID = 2643808051976643339L;
- private static final Logger logger = Logger.getLogger(CommonTaxonName.class);
+ private static final Logger logger = LogManager.getLogger(CommonTaxonName.class);
@XmlElement(name = "Name")
@Field(store=Store.YES)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Parameter;
implements ICdmTarget{
private static final long serialVersionUID = 5504218413819040193L;
- private static final Logger logger = Logger.getLogger(DescriptionBase.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionBase.class);
@XmlElement( name = "DescribedSpecimenOrObservation")
@ManyToOne(fetch = FetchType.LAZY)
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.ListIndexBase;
private static final long serialVersionUID = 5000910777835755905L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DescriptionElementBase.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementBase.class);
//type, category of information. In structured descriptions characters
@XmlElement(name = "Feature")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.name.TaxonName;
private static final long serialVersionUID = -8487673428764273806L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DescriptionElementSource.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementSource.class);
// ************************* FIELDS ********************************/
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DescriptionType.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionType.class);
private DescriptionType(UUID uuid, String defaultString, String key, DescriptionType parent){
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends IdentifiableEntity<DescriptiveDataSetDefaultCacheStrategy> {
private static final long serialVersionUID = 3256448866757415686L;
- private static final Logger logger = Logger.getLogger(DescriptiveDataSet.class);
+ private static final Logger logger = LogManager.getLogger(DescriptiveDataSet.class);
@XmlElementWrapper(name = "Representations")
@XmlElement(name = "Representation")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
public class Distribution extends DescriptionElementBase implements Cloneable {
private static final long serialVersionUID = 8366462435651559730L;
- private static final Logger logger = Logger.getLogger(Distribution.class);
+ private static final Logger logger = LogManager.getLogger(Distribution.class);
@XmlElement(name = "NamedArea")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Parameter;
private static final long serialVersionUID = 6754598791831848704L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Feature.class);
+ private static final Logger logger = LogManager.getLogger(Feature.class);
protected static Map<UUID, Feature> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.VersionableEntity;
private static final long serialVersionUID = -421832597710084356L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(FeatureState.class);
+ private static final Logger logger = LogManager.getLogger(FeatureState.class);
@XmlElement(name = "Feature")
@XmlIDREF
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class IndividualsAssociation extends DescriptionElementBase
implements IMultiLanguageTextHolder {
private static final long serialVersionUID = -4117554860254531809L;
- private static final Logger logger = Logger.getLogger(IndividualsAssociation.class);
+ private static final Logger logger = LogManager.getLogger(IndividualsAssociation.class);
@XmlElement(name = "Description")
@XmlJavaTypeAdapter(MultilanguageTextAdapter.class)
import javax.xml.bind.annotation.XmlType;\r
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.envers.Audited;\r
public class KeyStatement extends VersionableEntity implements IMultiLanguageTextHolder{\r
\r
private static final long serialVersionUID = 3771323100914695139L;\r
- private static final Logger logger = Logger.getLogger(KeyStatement.class);\r
+ private static final Logger logger = LogManager.getLogger(KeyStatement.class);\r
\r
\r
@XmlElement(name = "MultiLanguageText")\r
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.Language;
private static final long serialVersionUID = 4904519152652248312L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MeasurementUnit.class);
+ private static final Logger logger = LogManager.getLogger(MeasurementUnit.class);
public static final UUID uuidMeter = UUID.fromString("8bef5055-789c-41e5-bea2-8dc2ea8ecdf6");
private static final UUID uuidSecond = UUID.fromString("7cb20e73-d3c3-4290-bb55-98f7d1e76670");
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
@Audited
public class MediaKey extends Media implements IIdentificationKey{
private static final long serialVersionUID = -29095811051894471L;
- private static final Logger logger = Logger.getLogger(MediaKey.class);
+ private static final Logger logger = LogManager.getLogger(MediaKey.class);
@XmlElementWrapper(name = "CoveredTaxa")
@XmlElement(name = "CoveredTaxon")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.location.NamedArea;
public class MultiAccessKey extends DescriptiveDataSet implements IIdentificationKey{
private static final long serialVersionUID = -240407483572972239L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MultiAccessKey.class);
+ private static final Logger logger = LogManager.getLogger(MultiAccessKey.class);
@XmlElementWrapper(name = "CoveredTaxa")
@XmlElement(name = "CoveredTaxon")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.Language;
public class NaturalLanguageTerm extends DefinedTermBase<NaturalLanguageTerm> {
private static final long serialVersionUID = 6754598791831848705L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NaturalLanguageTerm.class);
+ private static final Logger logger = LogManager.getLogger(NaturalLanguageTerm.class);
protected static Map<UUID, NaturalLanguageTerm> termMap = null;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IIdentificationKey, IIntextReferenceTarget {
private static final long serialVersionUID = -3368243754557343942L;
- private static final Logger logger = Logger.getLogger(PolytomousKey.class);
+ private static final Logger logger = LogManager.getLogger(PolytomousKey.class);
@XmlElementWrapper(name = "CoveredTaxa")
@XmlElement(name = "CoveredTaxon")
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
@Entity
@Audited
public class PolytomousKeyNode extends VersionableEntity implements IMultiLanguageTextHolder {
- private static final Logger logger = Logger.getLogger(PolytomousKeyNode.class);
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyNode.class);
// This is the main key a node belongs to. Although other keys may also
// reference <code>this</code> node, a node usually belongs to a given key.
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.CdmUtils;
public class PresenceAbsenceTerm extends OrderedTermBase<PresenceAbsenceTerm> {
private static final long serialVersionUID = 1036807546935584396L;
- private static final Logger logger = Logger.getLogger(PresenceAbsenceTerm.class);
+ private static final Logger logger = LogManager.getLogger(PresenceAbsenceTerm.class);
//presence base
public static final UUID uuidPresent = UUID.fromString("cef81d25-501c-48d8-bbea-542ec50de2c2");
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends DescriptionElementBase {
private static final long serialVersionUID = -2755806455420051488L;
- private static final Logger logger = Logger.getLogger(QuantitativeData.class);
+ private static final Logger logger = LogManager.getLogger(QuantitativeData.class);
@XmlElement(name = "MeasurementUnit")
@XmlIDREF
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.springframework.beans.factory.annotation.Configurable;
private static final long serialVersionUID = -8506790426682192703L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SpecimenDescription.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenDescription.class);
// ************************ FACTORY *******************************/
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.Language;
public class State extends OrderedTermBase<State> {
private static final long serialVersionUID = -4816292463790262516L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(State.class);
+ private static final Logger logger = LogManager.getLogger(State.class);
public static final UUID uuidPresent = UUID.fromString("4f90d908-2061-4627-b251-0683c55b9c2e");
public static final UUID uuidAbsent = UUID.fromString("f193112f-68b2-4c74-bb82-05791892d2c4");
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IModifiable, IMultiLanguageTextHolder{
private static final long serialVersionUID = -4380314126624505415L;
- private static final Logger logger = Logger.getLogger(StateData.class);
+ private static final Logger logger = LogManager.getLogger(StateData.class);
@XmlElement(name = "CategoricalData")
@XmlIDREF
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.Language;
private static final long serialVersionUID = 9168097283660941430L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(StatisticalMeasure.class);
+ private static final Logger logger = LogManager.getLogger(StatisticalMeasure.class);
protected static Map<UUID, StatisticalMeasure> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Columns;\r
import org.hibernate.annotations.Type;\r
import org.hibernate.envers.Audited;\r
implements IModifiable{\r
\r
private static final long serialVersionUID = -3576311887760351982L;\r
- private static final Logger logger = Logger.getLogger(StatisticalMeasurementValue.class);\r
+ private static final Logger logger = LogManager.getLogger(StatisticalMeasurementValue.class);\r
\r
@XmlElement(name = "Value")\r
@Columns(columns={@Column(name="value", precision = 18, scale = 9), @Column(name="value_scale")})\r
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 8065879180505546803L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonDescription.class);
+ private static final Logger logger = LogManager.getLogger(TaxonDescription.class);
@XmlElementWrapper(name = "Scopes")
@XmlElement(name = "Scope")
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IMultiLanguageTextHolder{
private static final long serialVersionUID = -5014025677925668627L;
- private static final Logger logger = Logger.getLogger(TaxonInteraction.class);
+ private static final Logger logger = LogManager.getLogger(TaxonInteraction.class);
@XmlElement(name = "Description")
@XmlJavaTypeAdapter(MultilanguageTextAdapter.class)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -7349160369642038687L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNameDescription.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNameDescription.class);
@XmlElement(name="TaxonName")
@XmlIDREF
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Indexed;
private static final long serialVersionUID = -1064249780729501786L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TemporalData.class);
+ private static final Logger logger = LogManager.getLogger(TemporalData.class);
@XmlElement(name = "Period")
private ExtendedTimePeriod period = ExtendedTimePeriod.NewExtendedInstance();
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
implements IMultiLanguageTextHolder, Cloneable{
private static final long serialVersionUID = -2165015581278282615L;
- private static final Logger logger = Logger.getLogger(TextData.class);
+ private static final Logger logger = LogManager.getLogger(TextData.class);
//@XmlElement(name = "MultiLanguageText", type = MultilanguageText.class)
@XmlElement(name = "MultiLanguageText")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
public class TextFormat extends DefinedTermBase<TextFormat> {
private static final long serialVersionUID = 2063382669537212917L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TextFormat.class);
+ private static final Logger logger = LogManager.getLogger(TextFormat.class);
protected static Map<UUID, TextFormat> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import au.com.bytecode.opencsv.CSVWriter;
public class Country extends NamedArea {
private static final long serialVersionUID = -6791671976199722843L;
- private static final Logger logger = Logger.getLogger(Country.class);
+ private static final Logger logger = LogManager.getLogger(Country.class);
/**
* 2 character ISO 3166 Country codes
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class NamedArea extends OrderedTermBase<NamedArea> {
private static final long serialVersionUID = 6248434369557403036L;
- private static final Logger logger = Logger.getLogger(NamedArea.class);
+ private static final Logger logger = LogManager.getLogger(NamedArea.class);
//Continent UUIDs
private static final UUID uuidEurope = UUID.fromString("3b69f979-408c-4080-b573-0ad78a315610");
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.OrderedTermBase;
public class NamedAreaLevel extends OrderedTermBase<NamedAreaLevel> {
private static final long serialVersionUID = -7977901140330659208L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NamedAreaLevel.class);
+ private static final Logger logger = LogManager.getLogger(NamedAreaLevel.class);
protected static Map<UUID, NamedAreaLevel> termMap = null;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
@Audited
public class NamedAreaType extends DefinedTermBase<NamedAreaType> {
private static final long serialVersionUID = 8280172429797206548L;
- private static final Logger logger = Logger.getLogger(NamedAreaType.class);
+ private static final Logger logger = LogManager.getLogger(NamedAreaType.class);
protected static Map<UUID, NamedAreaType> termMap = null;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Latitude;
import org.hibernate.search.annotations.Longitude;
@Spatial(spatialMode=SpatialMode.RANGE, name="point")
public class Point implements Cloneable, Serializable {
private static final long serialVersionUID = 531030660792800636L;
- private static final Logger logger = Logger.getLogger(Point.class);
+ private static final Logger logger = LogManager.getLogger(Point.class);
//TODO was Float but H2 threw errors, maybe we should also use BigDecimal for exactness, see #8978
@XmlElement(name = "Longitude")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
private static final long serialVersionUID = -9060720949197749047L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ReferenceSystem.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceSystem.class);
protected static Map<UUID, ReferenceSystem> termMap = null;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.URI;
public class AudioFile extends MediaRepresentationPart {
private static final long serialVersionUID = 2327736023969971196L;
- private static final Logger logger = Logger.getLogger(AudioFile.class);
+ private static final Logger logger = LogManager.getLogger(AudioFile.class);
//length of recording in seconds
@XmlElement(name = "Duration")
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Parameter;
private static final long serialVersionUID = -5008959652949778843L;
- private static final Logger logger = Logger.getLogger(ExternalLink.class);
+ private static final Logger logger = LogManager.getLogger(ExternalLink.class);
/**
* The {@link ExternalLinkType type} of this link.
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
// **************** END ENUM **********************/
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExternalLinkType.class);
+ private static final Logger logger = LogManager.getLogger(ExternalLinkType.class);
private ExternalLinkType(UUID uuid, String defaultString, String key){
this(uuid, defaultString, key, null);
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 4038647011021908313L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IdentifiableMediaEntity.class);
+ private static final Logger logger = LogManager.getLogger(IdentifiableMediaEntity.class);
@XmlElementWrapper(name = "Media", nillable = true)
@XmlElement(name = "Medium")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.URI;
@Audited
public class ImageFile extends MediaRepresentationPart {
private static final long serialVersionUID = 5451418445009559953L;
- private static final Logger logger = Logger.getLogger(ImageFile.class);
+ private static final Logger logger = LogManager.getLogger(ImageFile.class);
//image height in pixel
@XmlElement(name = "Height")
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -1927421567263473658L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Media.class);
+ private static final Logger logger = LogManager.getLogger(Media.class);
// TODO once hibernate annotations support custom collection type
// private MultilanguageText title = new MultilanguageText();
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class MediaRepresentation extends VersionableEntity {
private static final long serialVersionUID = -1520078266008619806L;
- private static final Logger logger = Logger.getLogger(MediaRepresentation.class);
+ private static final Logger logger = LogManager.getLogger(MediaRepresentation.class);
//http://www.iana.org/assignments/media-types
@XmlElement(name = "MimeType")
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.annotations.Type;\r
public class MediaRepresentationPart extends VersionableEntity {\r
private static final long serialVersionUID = -1674422508643785796L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MediaRepresentationPart.class);\r
+ private static final Logger logger = LogManager.getLogger(MediaRepresentationPart.class);\r
\r
// where the media file is stored\r
@XmlElement(name = "URI")\r
import java.util.regex.Pattern;\r
import java.util.stream.Collectors;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
\r
public class MediaUtils {\r
\r
- private static final Logger logger = Logger.getLogger(MediaUtils.class);\r
+ private static final Logger logger = LogManager.getLogger(MediaUtils.class);\r
\r
\r
public static MediaRepresentation findBestMatchingRepresentation(Media media,\r
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.URI;
@Audited
public class MovieFile extends MediaRepresentationPart {
private static final long serialVersionUID = 8650308822737671731L;
- private static final Logger logger = Logger.getLogger(MovieFile.class);
+ private static final Logger logger = LogManager.getLogger(MovieFile.class);
//Length of movie in seconds
@XmlElement(name = "Duration")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
private static final long serialVersionUID = 4920749849951432284L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Rights.class);
+ private static final Logger logger = LogManager.getLogger(Rights.class);
//external location of copyright text
@XmlElement(name = "URI")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
@Audited
public class RightsType extends DefinedTermBase<RightsType> {
private static final long serialVersionUID = -5823263624000932116L;
- private static final Logger logger = Logger.getLogger(RightsType.class);
+ private static final Logger logger = LogManager.getLogger(RightsType.class);
protected static Map<UUID, RightsType> termMap = null;
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.joda.time.DateTime;
private static final long serialVersionUID = -3033376680593279078L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmMetaData.class);
+ private static final Logger logger = LogManager.getLogger(CdmMetaData.class);
private static final String UNNAMED = "- UNNAMED -";
*/
package eu.etaxonomy.cdm.model.metadata;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.IKeyTerm;
private int oldPropertyId;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermType.class);
+ private static final Logger logger = LogManager.getLogger(TermType.class);
private CdmMetaDataPropertyName(String label, String key, int oldPropertyId){
this.label = label;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class Amplification extends EventBase {
private static final long serialVersionUID = -6382383300974316261L;
- private static final Logger logger = Logger.getLogger(Amplification.class);
+ private static final Logger logger = LogManager.getLogger(Amplification.class);
/** @see #getDnaMarker()*/
@XmlElement(name = "DnaMarker")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class AmplificationResult extends AnnotatableEntity{
private static final long serialVersionUID = -8614860617229484621L;
- private static final Logger logger = Logger.getLogger(AmplificationResult.class);
+ private static final Logger logger = LogManager.getLogger(AmplificationResult.class);
/** @see #getDnaSample() */
@XmlElement( name = "DnaSample")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
public class Cloning extends MaterialOrMethodEvent implements Cloneable{
private static final long serialVersionUID = 6179007910988646989L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Cloning.class);
+ private static final Logger logger = LogManager.getLogger(Cloning.class);
/** @see #getStrain() */
@XmlElement(name = "strain")
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Analyze;
public class DnaQuality extends VersionableEntity implements Cloneable {
private static final long serialVersionUID = -8829069331010573654L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DnaQuality.class);
+ private static final Logger logger = LogManager.getLogger(DnaQuality.class);
// ****************** FACTORY METHOD *****************/
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -2978411330023671805L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DnaSample.class);
+ private static final Logger logger = LogManager.getLogger(DnaSample.class);
// ****************** FACTORY METHOD *****************/
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.media.Media;
@Audited
public class PhylogeneticTree extends Media implements Cloneable{
private static final long serialVersionUID = -7020182117362324067L;
- private static final Logger logger = Logger.getLogger(PhylogeneticTree.class);
+ private static final Logger logger = LogManager.getLogger(PhylogeneticTree.class);
@XmlElementWrapper(name = "UsedSequences")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class Primer extends AnnotatableEntity {
private static final long serialVersionUID = 6179007910988646989L;
- private static final Logger logger = Logger.getLogger(Primer.class);
+ private static final Logger logger = LogManager.getLogger(Primer.class);
/** @see #getLabel() */
@XmlElement(name = "Label")
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends AnnotatableEntity {
private static final long serialVersionUID = 8298983152731241775L;
- private static final Logger logger = Logger.getLogger(Sequence.class);
+ private static final Logger logger = LogManager.getLogger(Sequence.class);
//TODO move to cdmlib-ext?
private static final String GENBANK_BASE_URI = "http://www.ncbi.nlm.nih.gov/nuccore/%s";
import javax.xml.bind.annotation.XmlRootElement;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
\r
public class SequenceString implements Cloneable, Serializable{\r
\r
private static final long serialVersionUID = 45735207807329055L;\r
- private static final Logger logger = Logger.getLogger(SequenceString.class);\r
+ private static final Logger logger = LogManager.getLogger(SequenceString.class);\r
\r
/**{@link #getString()}*/\r
@XmlElement(name = "String")\r
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.annotations.Type;\r
@Audited\r
public class SingleRead extends EventBase implements Cloneable{\r
private static final long serialVersionUID = 1735535003073536132L;\r
- private static final Logger logger = Logger.getLogger(SingleRead.class);\r
+ private static final Logger logger = LogManager.getLogger(SingleRead.class);\r
\r
/** @see #getAmplificationResult() */\r
@XmlElement(name = "AmplificationResult")\r
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
public class HomotypicalGroup extends AnnotatableEntity {
private static final long serialVersionUID = -2308347613205551766L;
- private static final Logger logger = Logger.getLogger(HomotypicalGroup.class);
+ private static final Logger logger = LogManager.getLogger(HomotypicalGroup.class);
@XmlElementWrapper(name = "TypifiedNames")
@XmlElement(name = "TypifiedName")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.RelationshipBase;
implements Comparable<HybridRelationship>, IRuleConsidered{
private static final long serialVersionUID = -78515930138896939L;
- private static final Logger logger = Logger.getLogger(HybridRelationship.class);
+ private static final Logger logger = LogManager.getLogger(HybridRelationship.class);
// //The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
// //the note property.
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.Language;
public class HybridRelationshipType extends RelationshipTermBase<HybridRelationshipType> {
private static final long serialVersionUID = 5225908742890437668L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(HybridRelationshipType.class);
+ private static final Logger logger = LogManager.getLogger(HybridRelationshipType.class);
protected static Map<UUID, HybridRelationshipType> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.RelationshipBase;
implements IRuleConsidered{
private static final long serialVersionUID = -615987333520172043L;
- private static final Logger logger = Logger.getLogger(NameRelationship.class);
+ private static final Logger logger = LogManager.getLogger(NameRelationship.class);
// //The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
// //the note property.
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
implements INomenclaturalStanding {
private static final long serialVersionUID = 8504916205254159334L;
- static Logger logger = Logger.getLogger(NameRelationshipType.class);
+ static Logger logger = LogManager.getLogger(NameRelationshipType.class);
private static final UUID uuidOrthographicVariant = UUID.fromString("eeaea868-c4c1-497f-b9fe-52c9fc4aca53");
private static final UUID uuidMisspelling = UUID.fromString("c6f9afcb-8287-4a2b-a6f6-4da3a073d5de");
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends TypeDesignationBase<NameTypeDesignationStatus> {
private static final long serialVersionUID = 8478663508862210879L;
- final static Logger logger = Logger.getLogger(NameTypeDesignation.class);
+ final static Logger logger = LogManager.getLogger(NameTypeDesignation.class);
@XmlElement(name = "IsRejectedType")
private boolean rejectedType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.TermType;
public class NameTypeDesignationStatus extends TypeDesignationStatusBase<NameTypeDesignationStatus> {
private static final long serialVersionUID = -8801837496688711907L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NameTypeDesignationStatus.class);
+ private static final Logger logger = LogManager.getLogger(NameTypeDesignationStatus.class);
private static final UUID uuidOriginalDesignation = UUID.fromString("40032a44-973b-4a64-b25e-76f86c3a753c");
private static final UUID uuidMonotypy = UUID.fromString("3fc639b2-9a64-45f8-9a81-657a4043ad74");
import javax.xml.bind.annotation.XmlEnumValue;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.Language;\r
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
// Algae(UUID.fromString("abc09250-ea76-449b-b292-90acd61f8659"), "Algae", "BotanicalName"),\r
;\r
\r
- private static final Logger logger = Logger.getLogger(NomenclaturalCode.class);\r
+ private static final Logger logger = LogManager.getLogger(NomenclaturalCode.class);\r
\r
@Deprecated\r
private String dtype;\r
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.DOI;
import eu.etaxonomy.cdm.common.URI;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NomenclaturalCodeEdition.class);
+ private static final Logger logger = LogManager.getLogger(NomenclaturalCodeEdition.class);
private static final String WIKIDATA_BASE_URL = "https://www.wikidata.org/wiki/";
import javax.xml.bind.annotation.XmlEnum;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RankClass.class);
+ private static final Logger logger = LogManager.getLogger(RankClass.class);
int priority;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.SingleSourcedEntityBase;
implements IRuleConsidered{
private static final long serialVersionUID = -2451270405173131900L;
- static Logger logger = Logger.getLogger(NomenclaturalStatus.class);
+ static Logger logger = LogManager.getLogger(NomenclaturalStatus.class);
//The nomenclatural code rule considered. The article/note/recommendation in the code
//in question that is commented on in the note property.
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 1337101678484153972L;
- private static Logger logger = Logger.getLogger(NomenclaturalStatusType.class);
+ private static Logger logger = LogManager.getLogger(NomenclaturalStatusType.class);
//Botanical uuids
public static final UUID uuidIcnafpNomStatusVocabulary = UUID.fromString("bb28cdca-2f8a-4f11-9c21-517e9ae87f1f");
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
@Audited
public class Rank extends OrderedTermBase<Rank> {
private static final long serialVersionUID = -8648081681348758485L;
- private static final Logger logger = Logger.getLogger(Rank.class);
+ private static final Logger logger = LogManager.getLogger(Rank.class);
private static final UUID uuidEmpire = UUID.fromString("ac470211-1586-4b24-95ca-1038050b618d");
private static final UUID uuidDomain = UUID.fromString("ffca6ec8-8b88-417b-a6a0-f7c992aac19b");
import javax.xml.bind.annotation.XmlEnum;\r
import javax.xml.bind.annotation.XmlEnumValue;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.Language;\r
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;\r
\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(RankClass.class);\r
+ private static final Logger logger = LogManager.getLogger(RankClass.class);\r
\r
\r
\r
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
public class Registration extends AnnotatableEntity {
private static final long serialVersionUID = -5633923579539766801L;
- private static final Logger logger = Logger.getLogger(Registration.class);
+ private static final Logger logger = LogManager.getLogger(Registration.class);
@XmlElement(name = "Identifier")
@NullOrNotEmpty
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
REJECTED(UUID.fromString("0960e14a-a6b1-41b4-92a9-0d6d1b9e0159"), "Unknown unit type","REJ"),
;
- private final Logger logger = Logger.getLogger(RegistrationStatus.class);
+ private final Logger logger = LogManager.getLogger(RegistrationStatus.class);
private RegistrationStatus(UUID uuid, String defaultString, String key){
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Type;
import org.hibernate.envers.Audited;
public class RuleConsidered implements Cloneable, Serializable{
private static final long serialVersionUID = 531030660792800636L;
- private static final Logger logger = Logger.getLogger(RuleConsidered.class);
+ private static final Logger logger = LogManager.getLogger(RuleConsidered.class);
//The nomenclatural code rule considered. The article/note/recommendation in the code in question that is commented on in
//the note property.
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends TypeDesignationBase<SpecimenTypeDesignationStatus> {
private static final long serialVersionUID = 6481627446997275007L;
- private static final Logger logger = Logger.getLogger(SpecimenTypeDesignation.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenTypeDesignation.class);
@XmlElement(name = "TypeSpecimen")
@XmlIDREF
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.TermType;
public class SpecimenTypeDesignationStatus extends TypeDesignationStatusBase<SpecimenTypeDesignationStatus> {
private static final long serialVersionUID = -7918261741824966182L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SpecimenTypeDesignationStatus.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenTypeDesignationStatus.class);
protected static Map<UUID, SpecimenTypeDesignationStatus> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
INomenclaturalStanding {
private static final long serialVersionUID = -791164269603409712L;
- private static final Logger logger = Logger.getLogger(TaxonName.class);
+ private static final Logger logger = LogManager.getLogger(TaxonName.class);
/**
* The {@link NomenclaturalCode nomenclatural code} this taxon name is ruled by.
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 4838214337140859787L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TypeDesignationBase.class);
+ private static final Logger logger = LogManager.getLogger(TypeDesignationBase.class);
@XmlElement(name = "IsNotDesignated")
private boolean notDesignated;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.term.OrderedTermBase;
extends OrderedTermBase<T> {
private static final long serialVersionUID = -7204587330204725285L;
- static Logger logger = Logger.getLogger(TypeDesignationStatusBase.class);
+ static Logger logger = LogManager.getLogger(TypeDesignationStatusBase.class);
//********************************** Constructor *********************************/
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends IdentifiableMediaEntity<IIdentifiableEntityCacheStrategy<Collection>> {
private static final long serialVersionUID = -7833674897174732255L;
- private static final Logger logger = Logger.getLogger(Collection.class);
+ private static final Logger logger = LogManager.getLogger(Collection.class);
@XmlElement(name = "Code")
@Field(analyze = Analyze.NO)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class DerivationEvent extends EventBase {
private static final long serialVersionUID = 3661673673962819395L;
- private static final Logger logger = Logger.getLogger(DerivationEvent.class);
+ private static final Logger logger = LogManager.getLogger(DerivationEvent.class);
@XmlElementWrapper(name = "Originals")
@XmlElement(name = "Original")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
public class DerivationEventType extends DefinedTermBase<DerivationEventType> {
private static final long serialVersionUID = 6895093454763415279L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivationEventType.class);
+ private static final Logger logger = LogManager.getLogger(DerivationEventType.class);
private static final UUID uuidAccessioning = UUID.fromString("3c7c0929-0528-493e-9e5f-15e0d9585fa1");
private static final UUID uuidDnaExtraction = UUID.fromString("f9f957b6-88c0-4531-9a7f-b5fb1c9daf66");
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends SpecimenOrObservationBase<IIdentifiableEntityCacheStrategy<? extends DerivedUnit>> {
private static final long serialVersionUID = -3525746216270843517L;
- private static final Logger logger = Logger.getLogger(DerivedUnit.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnit.class);
@XmlElement(name = "Collection")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 5065341354427569773L;
- private static final Logger logger = Logger.getLogger(DeterminationEvent.class);
+ private static final Logger logger = LogManager.getLogger(DeterminationEvent.class);
@XmlElement(name = "IdentifiedUnit")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class FieldUnit extends SpecimenOrObservationBase<IIdentifiableEntityCacheStrategy<FieldUnit>> implements Cloneable{
private static final long serialVersionUID = -7586670941559035171L;
- private static final Logger logger = Logger.getLogger(FieldUnit.class);
+ private static final Logger logger = LogManager.getLogger(FieldUnit.class);
@XmlElement(name = "FieldNumber")
@Field
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
//@Indexed
public class GatheringEvent extends EventBase {
private static final long serialVersionUID = 7980806082366532180L;
- private static final Logger logger = Logger.getLogger(GatheringEvent.class);
+ private static final Logger logger = LogManager.getLogger(GatheringEvent.class);
@XmlElement(name = "Locality")
@OneToOne(fetch = FetchType.LAZY, orphanRemoval=true)
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.envers.Audited;\r
import org.hibernate.search.annotations.IndexedEmbedded;\r
\r
public class MaterialOrMethodEvent extends EventBase {\r
\r
private static final long serialVersionUID = -4799205199942053585L;\r
- private static final Logger logger = Logger.getLogger(MaterialOrMethodEvent.class);\r
+ private static final Logger logger = LogManager.getLogger(MaterialOrMethodEvent.class);\r
\r
@XmlElement(name = "DefinedMaterialOrMethod")\r
@XmlIDREF\r
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = -5717424451590705378L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MediaSpecimen.class);
+ private static final Logger logger = LogManager.getLogger(MediaSpecimen.class);
// ****************** FACTORY METHOD *****************/
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.SingleSourcedEntityBase;
extends SingleSourcedEntityBase {
private static final long serialVersionUID = 623891726208046243L;
- private static Logger logger = Logger.getLogger(OccurrenceStatus.class);
+ private static Logger logger = LogManager.getLogger(OccurrenceStatus.class);
@XmlElement(name = "OccurrenceStatusType")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.envers.Audited;\r
import org.hibernate.search.annotations.Analyze;\r
import org.hibernate.search.annotations.Field;\r
public class PreservationMethod extends MaterialOrMethodEvent implements Cloneable {\r
private static final long serialVersionUID = 2366116167028862401L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PreservationMethod.class);\r
+ private static final Logger logger = LogManager.getLogger(PreservationMethod.class);\r
\r
@XmlElement(name = "Medium")\r
@XmlIDREF\r
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
implements IMultiLanguageTextHolder, IIntextReferenceTarget, IDescribable<DescriptionBase<S>>, IPublishable {
private static final long serialVersionUID = 6932680139334408031L;
- private static final Logger logger = Logger.getLogger(SpecimenOrObservationBase.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenOrObservationBase.class);
/**
* An indication of what the unit record describes.
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.description.Feature;
;
@SuppressWarnings("unused")
- private final Logger logger = Logger.getLogger(SpecimenOrObservationType.class);
+ private final Logger logger = LogManager.getLogger(SpecimenOrObservationType.class);
private SpecimenOrObservationType(UUID uuid, String defaultString, String key){
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.core.GrantedAuthority;
import eu.etaxonomy.cdm.model.common.CdmBase;
public class GrantedAuthorityImpl extends CdmBase implements GrantedAuthority {
private static final long serialVersionUID = 2651969425860655040L;
- private static final Logger logger = Logger.getLogger(GrantedAuthority.class);
+ private static final Logger logger = LogManager.getLogger(GrantedAuthority.class);
@XmlElement(name = "Authority")
@Column(unique = true)
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.search.annotations.Field;
@Table(name = "PermissionGroup")
public class Group extends CdmBase {
private static final long serialVersionUID = 7216686200093054648L;
- private static final Logger logger = Logger.getLogger(Group.class);
+ private static final Logger logger = LogManager.getLogger(Group.class);
public final static UUID GROUP_EDITOR_UUID = UUID.fromString("22e5e8af-b99c-4884-a92f-71978efd3770");
public final static UUID GROUP_EDITOR_EXTENDED_CREATE_UUID = UUID.fromString("89a7f47f-6f2b-45ac-88d4-a99a4cf29f07");
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.CdmBaseType;
import eu.etaxonomy.cdm.model.common.CdmBase;
USER("User"),
;
- public static final Logger logger = Logger.getLogger(PermissionClass.class);
+ public static final Logger logger = LogManager.getLogger(PermissionClass.class);
private PermissionClass(String key){
//we have no UUIDs defined yet, but needed for tests
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
public class User extends CdmBase implements UserDetails {
private static final long serialVersionUID = 6582191171369439163L;
- private static final Logger logger = Logger.getLogger(User.class);
+ private static final Logger logger = LogManager.getLogger(User.class);
public static final String USERNAME_REGEX = "[A-Za-z0-9_\\.\\-]+";
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 4262357256080305268L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DescriptionElementSource.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementSource.class);
// ************************* FIELDS ********************************/
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
private static final long serialVersionUID = -1972959999261181462L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OriginalSourceBase.class);
+ private static final Logger logger = LogManager.getLogger(OriginalSourceBase.class);
/**
* The {@link OriginalSourceType type} of this source. According to PROV the type has to be thought as
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OriginalSourceType.class);
+ private static final Logger logger = LogManager.getLogger(OriginalSourceType.class);
@SuppressWarnings("unchecked")
private OriginalSourceType(UUID uuid, String defaultString, String key, OriginalSourceType parent){
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Parameter;
INomenclaturalReference, IReference, IIntextReferenceTarget {
private static final long serialVersionUID = -2034764545042691295L;
- private static final Logger logger = Logger.getLogger(Reference.class);
+ private static final Logger logger = LogManager.getLogger(Reference.class);
// from E+M import (still needed?)
// @Column(length=255)
package eu.etaxonomy.cdm.model.reference;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
public class ReferenceFactory {
- private static final Logger logger = Logger.getLogger(ReferenceFactory.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceFactory.class);
public static Reference newArticle(){
return new Reference(ReferenceType.Article);
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ReferenceType.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceType.class);
private ReferenceType(UUID uuid, String defaultString, String key, ReferenceType parent){
\r
package eu.etaxonomy.cdm.model.taxon;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.reference.Reference;\r
\r
public class AlternativeTreeRoot extends TaxonNode {\r
private static final long serialVersionUID = 3194452473289639597L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(AlternativeTreeRoot.class);\r
+ private static final Logger logger = LogManager.getLogger(AlternativeTreeRoot.class);\r
\r
private TaxonNode replacedTaxonNode; \r
\r
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements ITaxonTreeNode{
private static final long serialVersionUID = -753804821474209635L;
- private static final Logger logger = Logger.getLogger(Classification.class);
+ private static final Logger logger = LogManager.getLogger(Classification.class);
@XmlElement(name = "Name")
@OneToOne(fetch = FetchType.LAZY)
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
private static final long serialVersionUID = 6977221584815363620L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Synonym.class);
+ private static final Logger logger = LogManager.getLogger(Synonym.class);
@XmlElement(name = "acceptedTaxon")
@XmlIDREF
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
private static final long serialVersionUID = -3775216614202923889L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SynonymType.class);
+ private static final Logger logger = LogManager.getLogger(SynonymType.class);
protected static Map<UUID, SynonymType> termMap = null;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
implements IRelated<RelationshipBase>, IDescribable<TaxonDescription>, ICdmTarget{
private static final long serialVersionUID = -584946869762749006L;
- private static final Logger logger = Logger.getLogger(Taxon.class);
+ private static final Logger logger = LogManager.getLogger(Taxon.class);
private static final TaxonComparator defaultTaxonComparator = new TaxonComparator();
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IPublishable, IIntextReferenceTarget{
private static final long serialVersionUID = -3589185949928938529L;
- private static final Logger logger = Logger.getLogger(TaxonBase.class);
+ private static final Logger logger = LogManager.getLogger(TaxonBase.class);
public static final String ACC_TAXON_BRIDGE_PREFIX = "accTaxon";
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
implements ITaxonTreeNode, ITreeNode<TaxonNode>{
private static final long serialVersionUID = -4743289894926587693L;
- private static final Logger logger = Logger.getLogger(TaxonNode.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNode.class);
@XmlElement(name = "taxon")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.envers.Audited;\r
@Audited\r
public class TaxonNodeAgentRelation extends AnnotatableEntity {\r
private static final long serialVersionUID = -1476342569350403356L;\r
- private static final Logger logger = Logger.getLogger(TaxonNodeAgentRelation.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonNodeAgentRelation.class);\r
\r
@XmlElement(name = "TaxonNode")\r
@XmlIDREF\r
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.EnumeratedTermVoc;
// **************** END ENUM **********************/
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNodeStatus.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeStatus.class);
private String symbol;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
extends RelationshipBase<Taxon, Taxon, TaxonRelationshipType> {
private static final long serialVersionUID = 1378437971941534653L;
- static private final Logger logger = Logger.getLogger(TaxonRelationship.class);
+ static private final Logger logger = LogManager.getLogger(TaxonRelationship.class);
@XmlElement(name = "RelatedFrom")
@XmlIDREF
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
public class TaxonRelationshipType extends RelationshipTermBase<TaxonRelationshipType> {
private static final long serialVersionUID = 6575652105931691670L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonRelationshipType.class);
+ private static final Logger logger = LogManager.getLogger(TaxonRelationshipType.class);
protected static Map<UUID, TaxonRelationshipType> termMap = null;
import java.util.Map;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.term.init.ITermInitializer;
import eu.etaxonomy.cdm.model.term.init.ITermLoader;
public class DefaultTermInitializer implements ITermInitializer {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DefaultTermInitializer.class);
+ private static final Logger logger = LogManager.getLogger(DefaultTermInitializer.class);
protected ITermLoader termLoader = new TermLoader();
private boolean omit = false;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements IDefinedTerm<T>, Comparable<T> {
private static final long serialVersionUID = 2931811562248571531L;
- private static final Logger logger = Logger.getLogger(DefinedTermBase.class);
+ private static final Logger logger = LogManager.getLogger(DefinedTermBase.class);
// @XmlElement(name = "KindOf")
// @XmlIDREF
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.CdmUtils;
private static final long serialVersionUID = 8000797926720467399L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OrderedTermBase.class);
+ private static final Logger logger = LogManager.getLogger(OrderedTermBase.class);
//Order index, value < 1 means that this Term is not in order yet
@XmlElement(name = "OrderIndex")
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.common.URI;
private static final long serialVersionUID = 7871741306306371242L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OrderedTermVocabulary.class);
+ private static final Logger logger = LogManager.getLogger(OrderedTermVocabulary.class);
// ************************* FACTORY METHODS ***********************************************/
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Store;
@Audited
public class Representation extends LanguageStringBase {
private static final long serialVersionUID = -4202420199587324532L;
- private static final Logger logger = Logger.getLogger(Representation.class);
+ private static final Logger logger = LogManager.getLogger(Representation.class);
@XmlElement(name = "Label")
@Field(store=Store.YES)
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
private static final long serialVersionUID = 1471561531632115822L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermBase.class);
+ private static final Logger logger = LogManager.getLogger(TermBase.class);
@XmlElement(name = "URI")
@Field(analyze = Analyze.NO)
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
extends TermGraphBase<T, TermRelation<T>> {
private static final long serialVersionUID = -6713834139003172735L;
- private static final Logger logger = Logger.getLogger(TermGraph.class);
+ private static final Logger logger = LogManager.getLogger(TermGraph.class);
//******************** FACTORY METHODS ******************************************/
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
/**
private static final long serialVersionUID = -704169783744494023L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermGraphBase.class);
+ private static final Logger logger = LogManager.getLogger(TermGraphBase.class);
// ******************** CONSTRUCTOR *************************************/
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
extends TermRelationBase<T, TermNode<T>, TermTree>
implements ITreeNode<TermNode<T>> {
- private static final Logger logger = Logger.getLogger(TermNode.class);
+ private static final Logger logger = LogManager.getLogger(TermNode.class);
@XmlElement(name = "Parent")
@XmlIDREF
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.CdmBase;
private static final long serialVersionUID = -7835146268318871033L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermRelation.class);
+ private static final Logger logger = LogManager.getLogger(TermRelation.class);
@XmlElement(name = "ToTerm")
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
private static final long serialVersionUID = -7832621515891195623L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermRelationBase.class);
+ private static final Logger logger = LogManager.getLogger(TermRelationBase.class);
@XmlElement(name = "TermGraph")
@XmlIDREF
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.envers.Audited;
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
public class TermRelationshipType extends RelationshipTermBase<TermRelationshipType> {
private static final long serialVersionUID = 6575652105931691670L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermRelationshipType.class);
+ private static final Logger logger = LogManager.getLogger(TermRelationshipType.class);
protected static Map<UUID, TermRelationshipType> termMap = null;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.envers.Audited;
implements ITermTree<T, TermNode> {
private static final long serialVersionUID = -6713834139003172735L;
- private static final Logger logger = Logger.getLogger(TermTree.class);
+ private static final Logger logger = LogManager.getLogger(TermTree.class);
// TODO representations needed? TermTree was a TermBase until v3.3 but was removed from
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.agent.Institution;
import eu.etaxonomy.cdm.model.common.Language;
// **************** END ENUM **********************/
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermType.class);
+ private static final Logger logger = LogManager.getLogger(TermType.class);
private TermType(UUID uuid, String defaultString, String key){
this(uuid, defaultString, key, null);
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.Type;
extends TermCollection<T,TermNode> {
private static final long serialVersionUID = 1925052321596648672L;
- private static final Logger logger = Logger.getLogger(TermVocabulary.class);
+ private static final Logger logger = LogManager.getLogger(TermVocabulary.class);
//The vocabulary source (e.g. ontology) defining the terms to be loaded when a database
//is created for the first time.
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import au.com.bytecode.opencsv.CSVReader;
@Component
public class TermLoader implements ITermLoader {
- private static final Logger logger = Logger.getLogger(TermLoader.class);
+ private static final Logger logger = LogManager.getLogger(TermLoader.class);
@Override
public void unloadAllTerms(){
package eu.etaxonomy.cdm.model.term.init;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author AM
public class TermNotFoundException extends Exception {
private static final long serialVersionUID = 4288479011948189304L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermNotFoundException.class);
+ private static final Logger logger = LogManager.getLogger(TermNotFoundException.class);
/**
import javax.xml.bind.annotation.XmlRootElement;\r
import javax.xml.bind.annotation.XmlType;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.annotations.Type;\r
public class EntityConstraintViolation extends CdmBase {\r
private static final long serialVersionUID = 6685798691716413950L;\r
\r
- private static final Logger logger = Logger.getLogger(EntityConstraintViolation.class);\r
+ private static final Logger logger = LogManager.getLogger(EntityConstraintViolation.class);\r
\r
public static EntityConstraintViolation newInstance() {\r
return new EntityConstraintViolation();\r
import javax.xml.bind.annotation.XmlType;\r
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.annotations.Cascade;\r
import org.hibernate.annotations.CascadeType;\r
import org.hibernate.annotations.Fetch;\r
private static final long serialVersionUID = 9120571815593117363L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(EntityValidation.class);\r
+ private static final Logger logger = LogManager.getLogger(EntityValidation.class);\r
\r
public static EntityValidation newInstance() {\r
return new EntityValidation();\r
import java.util.UUID;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
\r
private static final long serialVersionUID = -274791080847215663L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(StrategyBase.class);\r
+ private static final Logger logger = LogManager.getLogger(StrategyBase.class);\r
\r
abstract protected UUID getUuid();\r
\r
import java.util.UUID;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.model.agent.Institution;\r
\r
private static final long serialVersionUID = 4586884860596045736L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(Collection.class);\r
+ private static final Logger logger = LogManager.getLogger(Collection.class);\r
\r
public static UUID uuid = UUID.fromString("20a61a6f-aac9-422e-a95f-20dfacd35b65");\r
\r
import java.util.regex.Matcher;\r
import java.util.regex.Pattern;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.model.agent.Person;\r
\r
private static final long serialVersionUID = -6184639515553953112L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PersonDefaultCacheStrategy.class);\r
+ private static final Logger logger = LogManager.getLogger(PersonDefaultCacheStrategy.class);\r
\r
final static UUID uuid = UUID.fromString("9abda0e1-d5cc-480f-be38-40a510a3f253");\r
\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.agent.Team;
private static final long serialVersionUID = 8375295443642690479L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TeamDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(TeamDefaultCacheStrategy.class);
public static final String FINAL_TEAM_CONCATINATION = " & ";
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
import eu.etaxonomy.cdm.strategy.StrategyBase;\r
private static final long serialVersionUID = -6358630407241112369L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(IdentifiableEntityDefaultCacheStrategy.class);\r
+ private static final Logger logger = LogManager.getLogger(IdentifiableEntityDefaultCacheStrategy.class);\r
\r
final static UUID uuid = UUID.fromString("85cbecb0-2020-11de-8c30-0800200c9a66");\r
\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.common.Language;\r
\r
private static final long serialVersionUID = 7246846028810250751L;\r
\r
- protected static final Logger logger = Logger.getLogger(MediaDefaultCacheStrategy.class);\r
+ protected static final Logger logger = LogManager.getLogger(MediaDefaultCacheStrategy.class);\r
\r
final static UUID uuid = UUID.fromString("0517ae48-597d-4d6b-9f18-8752d689720d");\r
\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.format.reference.NomenclaturalSourceFormatter;
implements INameCacheStrategy {
private static final long serialVersionUID = -2322348388258675517L;
- private static final Logger logger = Logger.getLogger(NameCacheStrategyBase.class);
+ private static final Logger logger = LogManager.getLogger(NameCacheStrategyBase.class);
final static UUID uuid = UUID.fromString("817ae5b5-3ac2-414b-a134-a9ae86cba040");
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.UTF8;
extends NameCacheStrategyBase
implements INonViralNameCacheStrategy {
- private static final Logger logger = Logger.getLogger(TaxonNameDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNameDefaultCacheStrategy.class);
private static final long serialVersionUID = -6577757501563212669L;
final static UUID uuid = UUID.fromString("1cdda0d1-d5bc-480f-bf08-40a510a2f223");
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.name.INonViralName;\r
import eu.etaxonomy.cdm.model.name.Rank;\r
extends TaxonNameDefaultCacheStrategy {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ZooNameNoMarkerCacheStrategy.class);\r
+ private static final Logger logger = LogManager.getLogger(ZooNameNoMarkerCacheStrategy.class);\r
private static final long serialVersionUID = 2821727191810867550L;\r
\r
final static UUID uuid = UUID.fromString("8ffa5f04-0303-4875-be44-dac5ff95b874");\r
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.occurrence.Collection;
private static final long serialVersionUID = 457142779236428472L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CollectionDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(CollectionDefaultCacheStrategy.class);
private static final UUID uuid = UUID.fromString("42834de1-698c-4d43-a31a-1c5617a708d6");
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.agent.Institution;
private static final long serialVersionUID = -3905309456296895952L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitDefaultCacheStrategy.class);
private static final UUID uuid = UUID.fromString("2746bca3-f58a-4b5d-b4ec-ece9785731fe");
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
private static final long serialVersionUID = -7166834437359037691L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DnaSampleDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(DnaSampleDefaultCacheStrategy.class);
private static final UUID uuid = UUID.fromString("48e72fbc-9714-4df6-b031-ba361fbf3f59");
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.format.occurrences.DistanceStringFormatter;
private static final long serialVersionUID = -2313124329424995472L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(FieldUnitDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(FieldUnitDefaultCacheStrategy.class);
private static final String METER = "m";
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.LanguageString;
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
private static final long serialVersionUID = 798148956185549004L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MediaSpecimenDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(MediaSpecimenDefaultCacheStrategy.class);
private static final UUID uuid = UUID.fromString("2df06501-0e2f-4255-b1e6-091be7293f7c");
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.format.DateTimeFormat;\r
import org.joda.time.format.DateTimeFormatter;\r
\r
private static final long serialVersionUID = 6773742298840407263L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ReferenceDefaultCacheStrategy.class);\r
+ private static final Logger logger = LogManager.getLogger(ReferenceDefaultCacheStrategy.class);\r
\r
private final static UUID uuid = UUID.fromString("63e669ca-c6be-4a8a-b157-e391c22580f9");\r
\r
package eu.etaxonomy.cdm.strategy.cache.reference;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.UTF8;
* @since 25.05.2016
*/
public class TitleWithoutYearAndAuthorHelper {
- private static final Logger logger = Logger.getLogger(TitleWithoutYearAndAuthorHelper.class);
+ private static final Logger logger = LogManager.getLogger(TitleWithoutYearAndAuthorHelper.class);
//article
private static final String prefixArticleReferenceJounal = UTF8.EN_DASH + " ";
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.Representation;
private static final long serialVersionUID = 7687293307791110547L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermDefaultCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(TermDefaultCacheStrategy.class);
final static UUID uuid = UUID.fromString("9cdf52c1-bac4-4b6c-a7f9-1a87401bd8f9");
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.BigDecimalUtil;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class PolytomousKeyGenerator {
- private static final Logger logger = Logger.getLogger(PolytomousKeyGenerator.class);
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyGenerator.class);
/**
* Strings used for generating the statements of the key.
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
private static final long serialVersionUID = -4711438819176248413L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(BasionymRelationCreator.class);
+ private static final Logger logger = LogManager.getLogger(BasionymRelationCreator.class);
private UUID uuid = UUID.fromString("e9e1d1f5-e398-4ba7-81a6-92875573d7cb");
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.DoubleResult;\r
import eu.etaxonomy.cdm.strategy.match.Match.ReplaceMode;\r
*/\r
public class CacheMatcher extends FieldMatcherBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CacheMatcher.class);\r
+ private static final Logger logger = LogManager.getLogger(CacheMatcher.class);\r
\r
private ReplaceMode cacheReplaceMode;\r
private List<String> replacedProperties;\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.DOI;
implements IMatchStrategyEqual, IParsedMatchStrategy {
private static final long serialVersionUID = 5045874493910155162L;
- private static final Logger logger = Logger.getLogger(DefaultMatchStrategy.class);
+ private static final Logger logger = LogManager.getLogger(DefaultMatchStrategy.class);
final static UUID uuid = UUID.fromString("69467b70-07ec-43a6-b779-3ec8d013837b");
\r
import java.lang.reflect.Field;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public class FieldMatcher extends FieldMatcherBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(FieldMatcher.class);\r
+ private static final Logger logger = LogManager.getLogger(FieldMatcher.class);\r
\r
private IMatchStrategy matchStrategy;\r
\r
\r
import java.lang.reflect.Field;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public abstract class FieldMatcherBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(FieldMatcherBase.class);\r
+ private static final Logger logger = LogManager.getLogger(FieldMatcherBase.class);\r
\r
private String propertyName ;\r
private Field field;\r
\r
package eu.etaxonomy.cdm.strategy.match;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
public class MatchException extends Exception {\r
private static final long serialVersionUID = -5128952015522078808L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MatchException.class);\r
+ private static final Logger logger = LogManager.getLogger(MatchException.class);\r
\r
/**\r
* \r
package eu.etaxonomy.cdm.strategy.match;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.ICheckEmpty;\r
\r
//value, otherwise dirty data which should not be matched\r
//e.g. NewParsedJournalInstance-authorship\r
\r
- private static final Logger logger = Logger.getLogger(MatchMode.class);\r
+ private static final Logger logger = LogManager.getLogger(MatchMode.class);\r
\r
public MatchResult matches(Object obj1, Object obj2, IMatchStrategy matchStrategy, String fieldName, boolean failAll) throws MatchException{\r
if (this == EQUAL_REQUIRED){\r
import java.util.SortedMap;\r
import java.util.TreeMap;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
*/\r
public class Matching {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(Matching.class);\r
+ private static final Logger logger = LogManager.getLogger(Matching.class);\r
\r
private SortedMap<String, FieldMatcher> fieldMatchers = new TreeMap<>();\r
private SortedMap<String, FieldMatcher> tmpFieldMatchers = new TreeMap<>();\r
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author a.mueller
private static final long serialVersionUID = 1253144282030211050L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ParsedBaseMatchStrategy.class);
+ private static final Logger logger = LogManager.getLogger(ParsedBaseMatchStrategy.class);
final static UUID uuid = UUID.fromString("4e2efeca-96a3-4894-80f4-f1015295f059");
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DefaultMergeStrategy extends StrategyBase implements IMergeStrategy {
private static final long serialVersionUID = -8513956338156791995L;
- private static final Logger logger = Logger.getLogger(DefaultMergeStrategy.class);
+ private static final Logger logger = LogManager.getLogger(DefaultMergeStrategy.class);
final static UUID uuid = UUID.fromString("d85cd6c3-0147-452c-8fed-bbfb82f392f6");
public static DefaultMergeStrategy NewInstance(Class<? extends CdmBase> mergeClazz){
\r
package eu.etaxonomy.cdm.strategy.merge;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
public class MergeException extends Exception {\r
private static final long serialVersionUID = 4817603805690549936L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MergeException.class);\r
+ private static final Logger logger = LogManager.getLogger(MergeException.class);\r
\r
/**\r
* \r
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTimeFieldType;
import org.joda.time.Partial;
extends NonViralNameParserImplRegExBase
implements INonViralNameParser<INonViralName> {
- private static final Logger logger = Logger.getLogger(NonViralNameParserImpl.class);
+ private static final Logger logger = LogManager.getLogger(NonViralNameParserImpl.class);
// good intro: http://java.sun.com/docs/books/tutorial/essential/regex/index.html
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.UTF8;
*/
public abstract class NonViralNameParserImplRegExBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NonViralNameParserImplRegExBase.class);
+ private static final Logger logger = LogManager.getLogger(NonViralNameParserImplRegExBase.class);
// good regex intro: http://java.sun.com/docs/books/tutorial/essential/regex/index.html
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.Language;\r
\r
;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ParserProblem.class);\r
+ private static final Logger logger = LogManager.getLogger(ParserProblem.class);\r
\r
private final static int WARNING(){return 0;}\r
private final static int ERROR() {return 1;}\r
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.joda.time.DateTimeFieldType;
import org.joda.time.Partial;
* @since 14-Jul-2013
*/
public class TimePeriodParser {
- private static final Logger logger = Logger.getLogger(TimePeriodParser.class);
+ private static final Logger logger = LogManager.getLogger(TimePeriodParser.class);
private static final String dotOrWs = "(\\.\\s*|\\s+)";
private static final String dashOrWs = "(-"+TimePeriod.SEP+"\\s*|\\s+)";
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
*/
public class CoordinateConverter {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CoordinateConverter.class);
+ private static final Logger logger = LogManager.getLogger(CoordinateConverter.class);
//Patterns
private List<CoordinatePattern> patterns;
*/
package eu.etaxonomy.cdm.aspectj;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
public class NewEntityListenerTest
implements NewEntityListener {
- private static Logger logger = Logger.getLogger(NewEntityListenerTest.class);
+ private static Logger logger = LogManager.getLogger(NewEntityListenerTest.class);
private Object lastPropValue;
@Override
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
import org.junit.Before;
import org.junit.Test;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
public class PropertyChangeTest implements PropertyChangeListener {
- static Logger logger = Logger.getLogger(PropertyChangeTest.class);
+ static Logger logger = LogManager.getLogger(PropertyChangeTest.class);
private Object lastPropValue;
@Override
@Before
public void updateDebugLevel(){
- logger.setLevel(Level.INFO);
+ Configurator.setLevel(logger, Level.INFO);
}
}
\ No newline at end of file
import java.util.UUID;
import org.apache.commons.collections4.comparators.ReverseComparator;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class HomotypicGroupTaxonComparatorTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(HomotypicGroupTaxonComparatorTest.class);
+ private static final Logger logger = LogManager.getLogger(HomotypicGroupTaxonComparatorTest.class);
private Reference sec;
private Reference ref1;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
public class TaxonComparatorTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonComparatorTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonComparatorTest.class);
/******************** TESTS *****************************************************/
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
*/
public class TaxonNodeByNameComparatorTest {
- private static final Logger logger = Logger.getLogger(TaxonNodeByNameComparatorTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeByNameComparatorTest.class);
@Test
// @Ignore
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
*/
public class TaxonNodeNaturalComparatorTest {
- private static final Logger logger = Logger.getLogger(TaxonNodeByNameComparatorTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeByNameComparatorTest.class);
@SuppressWarnings("deprecation")
@Test
import java.sql.Types;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.usertype.UserType;
import org.joda.time.DateTimeFieldType;
import org.joda.time.Partial;
import org.junit.Test;
public class PartialUserTypeTest {
- private static final Logger logger = Logger.getLogger(PartialUserTypeTest.class);
+ private static final Logger logger = LogManager.getLogger(PartialUserTypeTest.class);
private UserType userType;
import java.beans.PropertyChangeEvent;\r
import java.beans.PropertyChangeListener;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
*/\r
public class TeamTest {\r
\r
- public static final Logger logger = Logger.getLogger(TeamTest.class);\r
+ public static final Logger logger = LogManager.getLogger(TeamTest.class);\r
\r
private Team teamProtected;\r
private Team teamWithMembers;\r
import java.net.URISyntaxException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class AnnotationTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AnnotationTest.class);
+ private static final Logger logger = LogManager.getLogger(AnnotationTest.class);
private static final String TEST_URI_STR = "http://test.abc.de";
import java.lang.reflect.Field;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
public class CdmBaseTest extends EntityTestBase{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmBaseTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmBaseTest.class);\r
\r
static CdmBase cdmBase;\r
\r
import java.util.Calendar;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTimeFieldType;
import org.joda.time.MutableDateTime;
import org.joda.time.Partial;
public class ExtendedTimePeriodTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ExtendedTimePeriodTest.class);
+ private static final Logger logger = LogManager.getLogger(ExtendedTimePeriodTest.class);
private ExtendedTimePeriod onlyStartYear;
private ExtendedTimePeriod onlyEndYear;
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
import org.springframework.util.Assert;\r
\r
public class ExtensionTypeTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ExtensionTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ExtensionTypeTest.class);\r
\r
//****************** TESTS *******************************************************/\r
\r
*/\r
package eu.etaxonomy.cdm.model.common;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
public class LanguageTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(LanguageTest.class);\r
+ private static final Logger logger = LogManager.getLogger(LanguageTest.class);\r
\r
// ************************** TESTS **********************************************/\r
\r
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
*/
public class MarkerTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(MarkerTest.class);
+ private static Logger logger = LogManager.getLogger(MarkerTest.class);
private static boolean flag1;
private static Marker marker1;
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
\r
import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
public class MarkerTypeTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(MarkerTypeTest.class);\r
+ private static Logger logger = LogManager.getLogger(MarkerTypeTest.class);\r
\r
private static final UUID uuidImported = UUID.fromString("96878790-4ceb-42a2-9738-a2242079b679");\r
private static final UUID uuidToBeChecked = UUID.fromString("34204192-b41d-4857-a1d4-28992bef2a2a");\r
\r
import java.util.Calendar;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTimeFieldType;\r
import org.joda.time.MutableDateTime;\r
import org.joda.time.Partial;\r
*/\r
public class TimePeriodTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TimePeriodTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TimePeriodTest.class);\r
\r
private TimePeriod onlyStartYear;\r
private TimePeriod onlyEndYear;\r
import java.util.Calendar;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTimeFieldType;
import org.joda.time.MutableDateTime;
import org.joda.time.Partial;
public class VerbatimTimePeriodTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(VerbatimTimePeriodTest.class);
+ private static final Logger logger = LogManager.getLogger(VerbatimTimePeriodTest.class);
private VerbatimTimePeriod onlyStartYear;
private VerbatimTimePeriod onlyEndYear;
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
public class DescriptionElementTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(DescriptionElementTest.class);\r
+ private static Logger logger = LogManager.getLogger(DescriptionElementTest.class);\r
\r
/* ************************** TESTS **********************************************************/\r
\r
import static org.junit.Assert.assertNotNull;\r
import static org.junit.Assert.assertTrue;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class PolytomousKeyNodeTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(PolytomousKeyNodeTest.class);\r
+ private static Logger logger = LogManager.getLogger(PolytomousKeyNodeTest.class);\r
\r
private PolytomousKey key1;\r
private Taxon taxon1;\r
\r
import java.io.PrintStream;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class PolytomousKeyTest extends EntityTestBase {\r
\r
- private static Logger logger = Logger.getLogger(PolytomousKeyTest.class);\r
+ private static Logger logger = LogManager.getLogger(PolytomousKeyTest.class);\r
\r
private PolytomousKey key1;\r
private Taxon taxon1;\r
import java.util.Collections;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
\r
public class PresenceAbsenceTermTest extends EntityTestBase {\r
\r
- private static final Logger logger = Logger.getLogger(PresenceAbsenceTermTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PresenceAbsenceTermTest.class);\r
\r
@Test\r
public void testReadCsvLineList() {\r
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
\r
public class TextDataTest extends EntityTestBase {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(TextDataTest.class);\r
+ private static Logger logger = LogManager.getLogger(TextDataTest.class);\r
\r
private TextData textDataLeer;\r
private TextData textData1;\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class NamedAreaTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NamedAreaTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NamedAreaTest.class);\r
\r
private NamedArea namedArea1;\r
private NamedAreaLevel level1;\r
\r
import java.text.ParseException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class PointTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PointTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PointTest.class);\r
\r
private Point point1;\r
private Point point2;\r
import java.util.TreeSet;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
public class TdwgAreaTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TdwgAreaTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TdwgAreaTest.class);\r
\r
// ************** TESTS *************************************************\r
\r
*/
package eu.etaxonomy.cdm.model.media;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class MediaTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MediaTest.class);
+ private static final Logger logger = LogManager.getLogger(MediaTest.class);
private Media media1;
private Team team1;
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
\r
\r
public class AmplificationTest {\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(AmplificationTest.class);\r
+ private static Logger logger = LogManager.getLogger(AmplificationTest.class);\r
\r
private UUID uuid = UUID.fromString("11e6b2d5-3eb5-4434-9c56-5bb4c1102147");\r
\r
\r
import java.net.URISyntaxException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class MolecularTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static Logger logger = Logger.getLogger(MolecularTest.class);\r
+ private static Logger logger = LogManager.getLogger(MolecularTest.class);\r
\r
private DnaSample dnaSample;\r
private DefinedTerm marker;\r
*/\r
package eu.etaxonomy.cdm.model.name;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
*/\r
public class BacterialNameTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(BacterialNameTest.class);\r
+ private static final Logger logger = LogManager.getLogger(BacterialNameTest.class);\r
\r
private IBacterialName bacterialName1;\r
\r
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class BotanicalNameTest extends EntityTestBase{
- private static final Logger logger = Logger.getLogger(BotanicalNameTest.class);
+ private static final Logger logger = LogManager.getLogger(BotanicalNameTest.class);
private TaxonName botanicalName1;
private IBotanicalName botanicalName2;
*/\r
package eu.etaxonomy.cdm.model.name;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class CultivarPlantNameTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CultivarPlantNameTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CultivarPlantNameTest.class);\r
\r
private static ICultivarPlantName name1;\r
\r
\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class HomotypicalGroupTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(HomotypicalGroupTest.class);\r
+ private static final Logger logger = LogManager.getLogger(HomotypicalGroupTest.class);\r
\r
private static HomotypicalGroup group1;\r
private static HomotypicalGroup group2;\r
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import eu.etaxonomy.cdm.test.unit.EntityTestBase;
public class NameRelationshipTypeTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NameRelationshipTypeTest.class);
+ private static final Logger logger = LogManager.getLogger(NameRelationshipTypeTest.class);
@Test
public void testNomenclaturalStanding() {
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
\r
import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
*/\r
public class NameTypeDesignationStatusTest extends EntityTestBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NameTypeDesignationStatusTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NameTypeDesignationStatusTest.class);\r
\r
private static final UUID uuidAutomatic = UUID.fromString("e89d8b21-615a-4602-913f-1625bf39a69f");\r
// private static final UUID uuidFirstRevisor = UUID.fromString("a14ec046-c48f-4a73-939f-bd57880c7565");\r
import static org.junit.Assert.assertNotNull;\r
import static org.junit.Assert.assertTrue;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class NameTypeDesignationTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NameTypeDesignationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NameTypeDesignationTest.class);\r
\r
private NameTypeDesignation term1 = null;\r
private NameTypeDesignation term2 = null;\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
\r
import eu.etaxonomy.cdm.test.unit.EntityTestBase;\r
*/\r
public class NomenclaturalStatusTypeTest extends EntityTestBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NomenclaturalStatusTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NomenclaturalStatusTypeTest.class);\r
\r
private static final UUID uuidDoubtful = UUID.fromString("0ffeb39e-872e-4c0f-85ba-a4150d9f9e7d");\r
private static final UUID uuidCombNov = UUID.fromString("ed508710-deef-44b1-96f6-1ce6d2c9c884");\r
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
* @author a.mueller
*/
public class NonViralNameTest extends EntityTestBase {
- private static Logger logger = Logger.getLogger(NonViralNameTest.class);
+ private static Logger logger = LogManager.getLogger(NonViralNameTest.class);
private INonViralName nonViralName1;
private INonViralName nonViralName2;
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
\r
import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
\r
public class RankTest extends EntityTestBase {\r
\r
- private static Logger logger = Logger.getLogger(RankTest.class);\r
+ private static Logger logger = LogManager.getLogger(RankTest.class);\r
\r
private static final UUID uuidEmpire = UUID.fromString("ac470211-1586-4b24-95ca-1038050b618d");\r
private static final UUID uuidDomain = UUID.fromString("ffca6ec8-8b88-417b-a6a0-f7c992aac19b");\r
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.BeanUtils;
public class SpecimenTypeDesignationTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SpecimenTypeDesignationTest.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenTypeDesignationTest.class);
private SpecimenTypeDesignation term1 = null;
private SpecimenTypeDesignation term2 = null;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class TaxonNameTest extends EntityTestBase {
- private static final Logger logger = Logger.getLogger(TaxonNameTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNameTest.class);
private TaxonName nameBase1;
private TaxonName nameBase2;
*/\r
package eu.etaxonomy.cdm.model.name;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
*/\r
public class ViralNameTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ViralNameTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ViralNameTest.class);\r
\r
private IViralName viralName1;\r
\r
*/\r
package eu.etaxonomy.cdm.model.name;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
*/\r
public class ZoologicalNameTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ZoologicalNameTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ZoologicalNameTest.class);\r
\r
private IZoologicalName zooName1;\r
\r
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
}
}
- private static final Logger logger = Logger.getLogger(SpecimenTest.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenTest.class);
private DerivedUnit specimen;
import static org.junit.Assert.assertEquals;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
*/
public class PublicationBaseTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(PublicationBaseTest.class);
+ private static Logger logger = LogManager.getLogger(PublicationBaseTest.class);
private IBook reference;
private IArticle reference2;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
* @since 01.04.2009
*/
public class ClassificationTest {
- private static final Logger logger = Logger.getLogger(ClassificationTest.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationTest.class);
private static String treeName1;
private static Classification classification1;
import static org.junit.Assert.assertSame;\r
import static org.junit.Assert.assertTrue;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class TaxonBaseTest extends EntityTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonBaseTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonBaseTest.class);\r
\r
private Reference sec;\r
private IZoologicalName name1;\r
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
*/
public class TaxonNodeTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNodeTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeTest.class);
private static String viewName1;
private static Classification classification1;
private static Classification classification2;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TaxonTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonTest.class);
private Reference sec;
private Reference misSec;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
public class DefaultTermInitializerTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);
+ private static final Logger logger = LogManager.getLogger(DefaultTermInitializerTest.class);
@BeforeClass
public static void setUpBeforeClass() {
*/
package eu.etaxonomy.cdm.model.term;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.test.unit.EntityTestBase;
public class DefinedTermBaseTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(DefinedTermBaseTest.class);
+ private static Logger logger = LogManager.getLogger(DefinedTermBaseTest.class);
/** ******* TEST ************************************ */
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class OrderedTermBaseTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OrderedTermBaseTest.class);
+ private static final Logger logger = LogManager.getLogger(OrderedTermBaseTest.class);
private OrderedTermBase otb1;
private OrderedTermBase otb2;
import java.util.SortedSet;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
public class OrderedTermVocabularyTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(OrderedTermVocabularyTest.class);
+ private static Logger logger = LogManager.getLogger(OrderedTermVocabularyTest.class);
private OrderedTermBase<?> otb1;
private OrderedTermBase<?> otb2;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TermTreeTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermTreeTest.class);
+ private static final Logger logger = LogManager.getLogger(TermTreeTest.class);
private TermTree<Feature> testTree;
private TermNode<Feature> node1;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
public class TermVocabularyTest extends EntityTestBase {
- private static Logger logger = Logger.getLogger(TermVocabularyTest.class);
+ private static Logger logger = LogManager.getLogger(TermVocabularyTest.class);
private DefinedTermBase<?> dtb1;
private DefinedTermBase<?> dtb2;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
*/
public class DefaultTermInitializerTest {
- static Logger logger = Logger.getLogger(DefaultTermInitializerTest.class);
+ static Logger logger = LogManager.getLogger(DefaultTermInitializerTest.class);
private DefaultTermInitializer defaultVocabularyStore;
private UUID uuidEnglish;
import java.util.Map;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
* @author a.mueller
*/
public class TermLoaderTest {
- static Logger logger = Logger.getLogger(TermLoaderTest.class);
+ static Logger logger = LogManager.getLogger(TermLoaderTest.class);
private TermLoader termLoader;
private Map<UUID,DefinedTermBase> terms;
import static org.junit.Assert.assertNotNull;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class PersonDefaultCacheStrategyTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PersonDefaultCacheStrategyTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PersonDefaultCacheStrategyTest.class);\r
\r
private static Person person1;\r
private static Person person2;\r
import static org.junit.Assert.assertNotNull;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TeamDefaultCacheStrategyTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TeamDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(TeamDefaultCacheStrategyTest.class);
private static Team team1;
private static Team team2;
import java.lang.reflect.Method;
import java.util.GregorianCalendar;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
*/
public class BotanicNameCacheStrategyTest extends NameCacheStrategyTestBase {
- private static final Logger logger = Logger.getLogger(BotanicNameCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(BotanicNameCacheStrategyTest.class);
private static final String familyNameString = "Familia";
private static final String genusNameString = "Genus";
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
import eu.etaxonomy.cdm.strategy.cache.TaggedText;
*/
public class NameCacheStrategyTestBase extends TermTestBase {
- private static final Logger logger = Logger.getLogger(ZoologicalNameCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(ZoologicalNameCacheStrategyTest.class);
protected Method getMethod(Class<?> clazz, String methodName, Class<?>... paramClazzes){
Method method;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TaxonNameDefaultCacheStrategyTest extends NameCacheStrategyTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNameDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNameDefaultCacheStrategyTest.class);
private TaxonNameDefaultCacheStrategy strategy;
import static org.junit.Assert.assertNotNull;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class ViralNameDefaultCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ViralNameDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(ViralNameDefaultCacheStrategyTest.class);
private TaxonNameDefaultCacheStrategy strategy;
private TaxonName viralName;
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class ZooNameNoMarkerCacheStrategyTest extends NameCacheStrategyTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ZooNameNoMarkerCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(ZooNameNoMarkerCacheStrategyTest.class);
private TaxonNameDefaultCacheStrategy strategy;
private TaxonName familyName;
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class ZoologicalNameCacheStrategyTest extends NameCacheStrategyTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ZoologicalNameCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(ZoologicalNameCacheStrategyTest.class);
private TaxonNameDefaultCacheStrategy strategy;
private TaxonName familyName;
*/
package eu.etaxonomy.cdm.strategy.cache.occurrence;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class DerivedUnitDefaultCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitDefaultCacheStrategyTest.class);
private DerivedUnit specimen;
private DerivationEvent derivationEvent;
*/
package eu.etaxonomy.cdm.strategy.cache.occurrence;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class FieldUnitDefaultCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(FieldUnitDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(FieldUnitDefaultCacheStrategyTest.class);
private FieldUnit fieldUnit;
private GatheringEvent gatheringEvent;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
public class ReferenceDefaultCacheStrategyTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ReferenceDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceDefaultCacheStrategyTest.class);
private static final String SEP = TimePeriod.SEP;
import static org.junit.Assert.assertEquals;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
public class TaxonBaseDefaultCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonBaseDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonBaseDefaultCacheStrategyTest.class);
private final String expectedNameTitleCache = "Abies alba (L.) Mill.";
private final String expectedNameCache = "Abies alba";
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TermDefaultCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermDefaultCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(TermDefaultCacheStrategyTest.class);
private TermDefaultCacheStrategy<?> strategy;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
public class PolytomousKeyGeneratorTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PolytomousKeyGeneratorTest.class);
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyGeneratorTest.class);
private static final boolean debug = true;
*/
package eu.etaxonomy.cdm.strategy.match;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
public class DefaultMatchStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DefaultMatchStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(DefaultMatchStrategyTest.class);
private DefaultMatchStrategy matchStrategy;
private IBook book1;
*/
package eu.etaxonomy.cdm.strategy.match;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class MatchStrategyFactoryTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MatchStrategyFactoryTest.class);
+ private static final Logger logger = LogManager.getLogger(MatchStrategyFactoryTest.class);
private static boolean FAIL_ALL = true;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
public class DefaultMergeStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DefaultMergeStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(DefaultMergeStrategyTest.class);
private DefaultMergeStrategy bookMergeStrategy;
private Reference book1;
import java.util.regex.Matcher;\r
import java.util.regex.Pattern;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.joda.time.Duration;\r
import org.junit.Assert;\r
\r
private static final String SEP = TimePeriod.SEP;\r
\r
- private static final Logger logger = Logger.getLogger(NonViralNameParserImplTest.class);\r
+ private static final Logger logger = LogManager.getLogger(NonViralNameParserImplTest.class);\r
\r
final private String strNameAbies1 = "Abies alba";\r
final private String strNameAbiesSub1 = "Abies alba subsp. beta";\r
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class ParserProblemTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ParserProblemTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ParserProblemTest.class);\r
\r
/**\r
* @throws java.lang.Exception\r
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTimeFieldType;
import org.joda.time.Partial;
import org.junit.Assert;
*/
public class TimePeriodParserTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TimePeriodParserTest.class);
+ private static final Logger logger = LogManager.getLogger(TimePeriodParserTest.class);
// private TimePeriod onlyStartYear;
// private TimePeriod onlyEndYear;
*/
package eu.etaxonomy.cdm.strategy.parser.location;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
*
*/
public class CoordinateConverterTest {
- private static final Logger logger = Logger.getLogger(CoordinateConverterTest.class);
+ private static final Logger logger = LogManager.getLogger(CoordinateConverterTest.class);
private CoordinateConverter coordinateConverter;
\r
package eu.etaxonomy.cdm.test.function;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.name.Rank;\r
import eu.etaxonomy.cdm.model.name.TaxonName;\r
* @since 21.11.2008\r
*/\r
public class TestFullReferenceParser {\r
- private static final Logger logger = Logger.getLogger(TestFullReferenceParser.class);\r
+ private static final Logger logger = LogManager.getLogger(TestFullReferenceParser.class);\r
\r
\r
private boolean test(){\r
import java.util.Calendar;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
*/\r
public class TestSpecimen {\r
\r
- private static final Logger logger = Logger.getLogger(TestSpecimen.class);\r
+ private static final Logger logger = LogManager.getLogger(TestSpecimen.class);\r
\r
public void testSpecimen(){\r
logger.info("Create test taxon ...");\r
import java.util.regex.Matcher;\r
import java.util.regex.Pattern;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
\r
import eu.etaxonomy.cdm.format.reference.NomenclaturalSourceFormatter;\r
*\r
*/\r
public class TestTaxonNameParserBotanicalNameImpl {\r
- private static final Logger logger = Logger.getLogger(TestTaxonNameParserBotanicalNameImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(TestTaxonNameParserBotanicalNameImpl.class);\r
\r
final private String strNameFamily = "Asteraceae";\r
final private String strNameGenus = "Abies Müller";\r
\r
package eu.etaxonomy.cdm.test.suite;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.runner.RunWith;\r
import org.junit.runners.Suite;\r
\r
}\r
)\r
public class CdmTestSuite {\r
- static Logger logger = Logger.getLogger(CdmTestSuite.class);\r
+ static Logger logger = LogManager.getLogger(CdmTestSuite.class);\r
\r
// the class remains completely empty,\r
// being used only as a holder for the above annotations\r
*/\r
package eu.etaxonomy.cdm.test.unit;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.test.TermTestBase;\r
*/\r
public abstract class EntityTestBase extends TermTestBase {\r
\r
- private static Logger logger = Logger.getLogger(EntityTestBase.class);\r
+ private static Logger logger = LogManager.getLogger(EntityTestBase.class);\r
\r
protected Class<CdmBase> clazzToTest = clazzToTest();\r
protected Class<CdmBase> clazzToTest(){\r
import javax.validation.ConstraintViolation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class BasionymsMustShareEpithetsAndAuthorsTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(BasionymsMustShareEpithetsAndAuthorsTest.class);
+ private static final Logger logger = LogManager.getLogger(BasionymsMustShareEpithetsAndAuthorsTest.class);
private IBotanicalName name;
private TaxonName basionymName;
import javax.validation.ConstraintViolation;\r
import javax.validation.groups.Default;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class CorrectEpithetsForRankTest extends ValidationTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CorrectEpithetsForRankTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CorrectEpithetsForRankTest.class);\r
\r
private IBotanicalName name;\r
\r
import javax.validation.ConstraintViolation;
import javax.validation.groups.Default;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class CorrectRanksForCodeTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CorrectRanksForCodeTest.class);
+ private static final Logger logger = LogManager.getLogger(CorrectRanksForCodeTest.class);
private IBotanicalName name;
import javax.validation.ConstraintViolation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
*/
public class MustHaveAuthorityTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MustHaveAuthorityTest.class);
+ private static final Logger logger = LogManager.getLogger(MustHaveAuthorityTest.class);
private IBotanicalName name;
import javax.validation.ConstraintViolation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class NameMustFollowCodeTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NameMustFollowCodeTest.class);
+ private static final Logger logger = LogManager.getLogger(NameMustFollowCodeTest.class);
private TaxonName nonViralName;
private TaxonName viralName;
import javax.validation.constraints.Pattern;
import javax.validation.groups.Default;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.validator.internal.constraintvalidators.bv.PatternValidator;
import org.junit.Before;
import org.junit.Ignore;
*/
@SuppressWarnings("unused")
public class NameValidCharactersTest extends ValidationTestBase {
- private static final Logger logger = Logger.getLogger(NameValidCharactersTest.class);
+ private static final Logger logger = LogManager.getLogger(NameValidCharactersTest.class);
private IBotanicalName name;
import javax.validation.ConstraintViolation;\r
import javax.validation.groups.Default;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
*/\r
@SuppressWarnings("unused")\r
public class ReferenceValidationTest extends ValidationTestBase {\r
- private static final Logger logger = Logger.getLogger(ReferenceValidationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ReferenceValidationTest.class);\r
\r
private IBook book;\r
\r
\r
import javax.validation.ConstraintViolation;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
*/\r
public class TaxonNameCannotBeAcceptedAndSynonymTest extends ValidationTestBase{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonNameCannotBeAcceptedAndSynonymTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonNameCannotBeAcceptedAndSynonymTest.class);\r
\r
private TaxonName name1;\r
private IBotanicalName name2;\r
*/
package eu.etaxonomy.cdm.validation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class ValidLectotypeSourceTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ValidLectotypeSourceTest.class);
+ private static final Logger logger = LogManager.getLogger(ValidLectotypeSourceTest.class);
static Class<?> validatorClass = LectotypeSourceValidator.class;
static Class<?> group = Level2.class;
import javax.validation.ConstraintViolation;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class ValidPasswordTest extends ValidationTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ValidPasswordTest.class);
+ private static final Logger logger = LogManager.getLogger(ValidPasswordTest.class);
private User user;
import javax.validation.ConstraintViolation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.validator.internal.constraintvalidators.bv.NotNullValidator;
import org.junit.Before;
import org.junit.Test;
public class ValidPointTest extends ValidationTestBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ValidPointTest.class);
+ private static final Logger logger = LogManager.getLogger(ValidPointTest.class);
private GatheringEvent gatheringEvent;
private Point point = new Point();
*/\r
package eu.etaxonomy.cdm.validation;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
*/\r
public class ValidTaxonomicYearTest extends ValidationTestBase {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ValidTaxonomicYearTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ValidTaxonomicYearTest.class);\r
\r
static Class<ValidTaxonomicYearValidator> validatorClass = ValidTaxonomicYearValidator.class;\r
static Class<Level3> group = Level3.class;\r
*/\r
package eu.etaxonomy.cdm.validation;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class ValidTypeDesignationTest extends ValidationTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ValidTypeDesignationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ValidTypeDesignationTest.class);\r
\r
static Class<?> validatorClass = TypeDesignationValidator.class;\r
static Class<?> group = Level2.class;\r
import java.io.InputStream;\r
import java.net.URL;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.BeansException;\r
import org.springframework.context.ApplicationContext;\r
import org.springframework.context.ApplicationContextAware;\r
import eu.etaxonomy.cdm.config.ConfigFileUtil;\r
\r
public class CdmApplicationUtils implements ApplicationContextAware {\r
- private static final Logger logger = Logger.getLogger(CdmApplicationUtils.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmApplicationUtils.class);\r
\r
private static ApplicationContext applicationContext;\r
\r
import java.io.IOException;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
public class AccountStore {
- private static Logger logger = Logger.getLogger(AccountStore.class);
+ private static Logger logger = LogManager.getLogger(AccountStore.class);
public final static File accountsFile = new File(ConfigFileUtil.perUserCdmFolderFallback() + File.separator + ".dbaccounts.properties");
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
*
*/
public class CdmPersistentSourceUtils {
- private static final Logger logger = Logger.getLogger(CdmPersistentSourceUtils.class);
+ private static final Logger logger = LogManager.getLogger(CdmPersistentSourceUtils.class);
/**
* Returns the directory containing the datasource config file
import java.util.List;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Attribute;
import org.jdom.Element;
*
*/
public class CdmPersistentXMLSource {
- private static final Logger logger = Logger.getLogger(CdmPersistentXMLSource.class);
+ private static final Logger logger = LogManager.getLogger(CdmPersistentXMLSource.class);
/**
import java.nio.file.Files;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.Environment;
*/
public class ConfigFileUtil implements EnvironmentAware {
- private static final Logger logger = Logger.getLogger(ConfigFileUtil.class);
+ private static final Logger logger = LogManager.getLogger(ConfigFileUtil.class);
/**
import java.util.Properties;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.cache.internal.NoCachingRegionFactory;\r
import org.hibernate.cache.spi.RegionFactory;\r
import org.springframework.beans.MutablePropertyValues;\r
public class CdmDataSource extends CdmDataSourceBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmDataSource.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDataSource.class);\r
\r
private DatabaseTypeEnum dbType;\r
private String database;\r
import java.util.Map;\r
import java.util.Properties;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.cache.spi.RegionFactory;\r
import org.hibernate.envers.boot.internal.EnversIntegrator;\r
import org.springframework.beans.MutablePropertyValues;\r
*/\r
public abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource {\r
\r
- private static final Logger logger = Logger.getLogger(CdmDataSourceBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDataSourceBase.class);\r
\r
\r
// private static final int TIMEOUT = 10;\r
\r
import javax.sql.DataSource;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.cache.spi.RegionFactory;\r
import org.jdom.Attribute;\r
import org.jdom.Element;\r
implements ICdmPersistentSource {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmPersistentDataSource.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmPersistentDataSource.class);\r
\r
public static final String DATASOURCE_BEAN_POSTFIX = "DataSource";\r
\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.xml.XmlBeanFactory;\r
import org.springframework.core.io.FileSystemResource;\r
\r
// @Component\r
public class DataSourceBeanLoader {\r
\r
- private static final Logger logger = Logger.getLogger(DataSourceBeanLoader.class);\r
+ private static final Logger logger = LogManager.getLogger(DataSourceBeanLoader.class);\r
\r
private static final String DATASOURCE_BEANDEF_FILE = "datasources.xml";\r
// see #8506 private static final String DATASOURCE_BEANDEF_PATH = ConfigFileUtil.getCdmHomeDir().getPath();\r
\r
package eu.etaxonomy.cdm.database;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.mueller\r
public class DataSourceNotFoundException extends Exception {\r
private static final long serialVersionUID = 5269129655671736295L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DataSourceNotFoundException.class);\r
+ private static final Logger logger = LogManager.getLogger(DataSourceNotFoundException.class);\r
\r
/**\r
* @param message\r
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.SessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
@Component
public class DataSourceReloader {
- static final Logger logger = Logger.getLogger(DataSourceReloader.class);
+ static final Logger logger = LogManager.getLogger(DataSourceReloader.class);
private SessionFactory factory;
*/\r
package eu.etaxonomy.cdm.database;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author e.-m.lee\r
*\r
*/\r
public class DatabaseSchemaMismatchException extends Exception {\r
- private static final Logger logger = Logger.getLogger(DatabaseSchemaMismatchException.class);\r
+ private static final Logger logger = LogManager.getLogger(DatabaseSchemaMismatchException.class);\r
\r
/**\r
* @param message\r
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.dialect.Dialect;
import eu.etaxonomy.cdm.database.types.H2DatabaseType;
}
//Logger
- private static final Logger logger = Logger.getLogger(DatabaseTypeEnum.class);
+ private static final Logger logger = LogManager.getLogger(DatabaseTypeEnum.class);
protected IDatabaseType dbType;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author n.hoffmann
*/
public class DbcpSaveDataSource extends BasicDataSource {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DbcpSaveDataSource.class);
+ private static final Logger logger = LogManager.getLogger(DbcpSaveDataSource.class);
/* FIXME This is a workaround to solve a problem with dbcp connection pooling.
* Remove this when dbcp connection pool gets configured correctly
\r
package eu.etaxonomy.cdm.database;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author AM\r
EMBEDDED,\r
IN_MEMORY,\r
TCP;\r
- private static final Logger logger = Logger.getLogger(H2Mode.class);\r
+ private static final Logger logger = LogManager.getLogger(H2Mode.class);\r
\r
\r
private static final String embedded = "embedded";\r
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.h2.tools.Server;
import org.springframework.jdbc.CannotGetJdbcConnectionException;
*
*/
public class LocalH2 extends BasicDataSource {
- private static final Logger logger = Logger.getLogger(LocalH2.class);
+ private static final Logger logger = LogManager.getLogger(LocalH2.class);
private final String sep = System.getProperty("file.separator");
import java.util.Properties;\r
\r
import org.apache.commons.dbcp.BasicDataSource;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hsqldb.server.Server;\r
import org.springframework.jdbc.CannotGetJdbcConnectionException;\r
\r
* @author a.mueller\r
*/\r
public class LocalHsqldb extends BasicDataSource {\r
- private static final Logger logger = Logger.getLogger(LocalHsqldb.class);\r
+ private static final Logger logger = LogManager.getLogger(LocalHsqldb.class);\r
\r
private String sep = System.getProperty("file.separator");\r
\r
import java.util.EnumSet;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.springframework.security.core.Authentication;
public class PermissionDeniedException extends HibernateException {
private static final long serialVersionUID = 6993452039967589921L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PermissionDeniedException.class);
+ private static final Logger logger = LogManager.getLogger(PermissionDeniedException.class);
/**
* @param message
import javax.annotation.PostConstruct;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.joda.time.DateTime;
import org.joda.time.Period;
@Component
public class PersistentTermInitializer extends DefaultTermInitializer {
- private static final Logger logger = Logger.getLogger(PersistentTermInitializer.class);
+ private static final Logger logger = LogManager.getLogger(PersistentTermInitializer.class);
private boolean omit = false;
protected ITermVocabularyDao vocabularyDao;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.cache.spi.RegionFactory;
import org.springframework.beans.factory.config.BeanDefinition;
//FIXME this class replicates lots of code in CdmDataSourceBase, we may want to merge it
//in a common helper class to avoid redundant code
public class WrappedCdmDataSource implements ICdmDataSource {
- private static final Logger logger = Logger.getLogger(WrappedCdmDataSource.class);
+ private static final Logger logger = LogManager.getLogger(WrappedCdmDataSource.class);
private final DataSource datasource;
\r
import javax.sql.DataSource;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.dialect.Dialect;\r
\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
*\r
*/\r
abstract class DatabaseTypeBase implements IDatabaseType {\r
- private static final Logger logger = Logger.getLogger(DatabaseTypeBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DatabaseTypeBase.class);\r
\r
//typeName\r
private String typeName;\r
\r
import javax.sql.DataSource;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.dialect.Dialect;\r
import org.hibernate.dialect.H2CorrectedDialect;\r
\r
*\r
*/\r
public class H2DatabaseType extends DatabaseTypeBase {\r
- private static final Logger logger = Logger.getLogger(H2DatabaseType.class);\r
+ private static final Logger logger = LogManager.getLogger(H2DatabaseType.class);\r
\r
//typeName\r
private final String typeName = "H2 Database";\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
public class AllowNullUpdater
extends AuditedSchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(AllowNullUpdater.class);
+ private static final Logger logger = LogManager.getLogger(AllowNullUpdater.class);
private String columnName;
private Datatype datatype;
import java.sql.ResultSet;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
*/
public class CdmUpdater {
- private static final Logger logger = Logger.getLogger(CdmUpdater.class);
+ private static final Logger logger = LogManager.getLogger(CdmUpdater.class);
private static final ISchemaUpdater getCurrentSchemaUpdater() {
return SchemaUpdater_5271_5290.NewInstance();
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
public class ClassBaseTypeUpdater extends AuditedSchemaUpdaterStepBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TableCreator.class);\r
+ private static final Logger logger = LogManager.getLogger(TableCreator.class);\r
\r
private final boolean includeIdentifiableEntity;\r
private final boolean includeAnnotatableEntity;\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class ClassChanger
extends AuditedSchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(ClassChanger.class);
+ private static final Logger logger = LogManager.getLogger(ClassChanger.class);
private final String newClassName;
private final String[] oldClassNames;
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
* @since 16.09.2010\r
*/\r
public class ColumnAdder extends AuditedSchemaUpdaterStepBase {\r
- private static final Logger logger = Logger.getLogger(ColumnAdder.class);\r
+ private static final Logger logger = LogManager.getLogger(ColumnAdder.class);\r
\r
private final String newColumnName;\r
private final Datatype columnType;\r
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
public class ColumnNameChanger\r
extends AuditedSchemaUpdaterStepBase{\r
\r
- private static final Logger logger = Logger.getLogger(ColumnNameChanger.class);\r
+ private static final Logger logger = LogManager.getLogger(ColumnNameChanger.class);\r
\r
private String newColumnName;\r
private String oldColumnName;\r
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
public class ColumnRemover\r
extends AuditedSchemaUpdaterStepBase{\r
\r
- private static final Logger logger = Logger.getLogger(ColumnRemover.class);\r
+ private static final Logger logger = LogManager.getLogger(ColumnRemover.class);\r
\r
private final String oldColumnName;\r
\r
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
\r
private static final String _OLDXXX = "_oldxxx";\r
\r
- private static final Logger logger = Logger.getLogger(ColumnTypeChanger.class);\r
+ private static final Logger logger = LogManager.getLogger(ColumnTypeChanger.class);\r
\r
private final String columnName;\r
private final Datatype newColumnType;\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class ColumnValueUpdater
extends AuditedSchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(ColumnValueUpdater.class);
+ private static final Logger logger = LogManager.getLogger(ColumnValueUpdater.class);
private final String columnName;
private final String newValueStr;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
* @since 2016-10-18
*/
public class IndexAdder extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(IndexAdder.class);
+ private static final Logger logger = LogManager.getLogger(IndexAdder.class);
private String tableName;
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
*
*/
public class IndexRenamer extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(IndexRenamer.class);
+ private static final Logger logger = LogManager.getLogger(IndexRenamer.class);
private String tableName;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class RelationSwapper extends AuditedSchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(RelationSwapper.class);
+ private static final Logger logger = LogManager.getLogger(RelationSwapper.class);
private static final int PLACEHOLDER = -987;
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
implements ISchemaUpdater {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SchemaUpdaterBase.class);\r
+ private static final Logger logger = LogManager.getLogger(SchemaUpdaterBase.class);\r
\r
public static final boolean INCLUDE_AUDIT = true;\r
protected static final boolean INCLUDE_CDM_BASE = true;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
* @since 13.09.2010\r
*/\r
public abstract class SchemaUpdaterStepBase implements ISchemaUpdaterStep {\r
- private static final Logger logger = Logger.getLogger(SchemaUpdaterStepBase.class);\r
+ private static final Logger logger = LogManager.getLogger(SchemaUpdaterStepBase.class);\r
\r
protected String stepName;\r
\r
import java.util.Map;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
*\r
*/\r
public class SimpleSchemaUpdaterStep extends SchemaUpdaterStepBase {\r
- private static final Logger logger = Logger.getLogger(SimpleSchemaUpdaterStep.class);\r
+ private static final Logger logger = LogManager.getLogger(SimpleSchemaUpdaterStep.class);\r
\r
private final Map<DatabaseTypeEnum, String> queryMap = new HashMap<>();\r
private final Map<DatabaseTypeEnum, String> auditQueryMap = new HashMap<>();\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
extends SchemaUpdaterStepBase{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SingleTermRemover.class);\r
+ private static final Logger logger = LogManager.getLogger(SingleTermRemover.class);\r
\r
// **************************** FACTORY METHODS ********************************/\r
\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
public class SingleTermUpdater extends SchemaUpdaterStepBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SingleTermUpdater.class);\r
+ private static final Logger logger = LogManager.getLogger(SingleTermUpdater.class);\r
\r
// **************************** FACTORY METHODS ********************************/\r
\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
*/\r
public class SortIndexUpdater extends SchemaUpdaterStepBase {\r
\r
- private static final Logger logger = Logger.getLogger(SortIndexUpdater.class);\r
+ private static final Logger logger = LogManager.getLogger(SortIndexUpdater.class);\r
\r
private final String tableName;\r
private final String sortIndexColumn;\r
import java.util.List;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
* @since 16.09.2010\r
*/\r
public class TableCreator extends AuditedSchemaUpdaterStepBase {\r
- private static final Logger logger = Logger.getLogger(TableCreator.class);\r
+ private static final Logger logger = LogManager.getLogger(TableCreator.class);\r
\r
private static final boolean IS_LIST = true;\r
private static final boolean IS_1_TO_M = true;\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
public class TableDropper
extends AuditedSchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(TableDropper.class);
+ private static final Logger logger = LogManager.getLogger(TableDropper.class);
private boolean ifExists = true;
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
public class TableNameChanger\r
extends SchemaUpdaterStepBase{\r
\r
- private static final Logger logger = Logger.getLogger(TableNameChanger.class);\r
+ private static final Logger logger = LogManager.getLogger(TableNameChanger.class);\r
\r
private String oldName;\r
private String newName;\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
*/\r
public class TermMover extends SchemaUpdaterStepBase{\r
\r
- private static final Logger logger = Logger.getLogger(TermMover.class);\r
+ private static final Logger logger = LogManager.getLogger(TermMover.class);\r
\r
public static final TermMover NewInstance(List<ISchemaUpdaterStep> stepList, String stepName, UUID newVocabulary, String uuidTerm){\r
List<String> terms = new ArrayList<>();\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermRepresentationAdder.class);
+ private static final Logger logger = LogManager.getLogger(TermRepresentationAdder.class);
public static final TermRepresentationAdder NewInstance(List<ISchemaUpdaterStep> stepList, String stepName, UUID uuidTerm, String description, String label, String abbrev, UUID uuidLanguage){
return new TermRepresentationAdder(stepList, stepName, uuidTerm, description, label, abbrev, uuidLanguage, false);
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
extends SchemaUpdaterStepBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TermRepresentationUpdater.class);\r
+ private static final Logger logger = LogManager.getLogger(TermRepresentationUpdater.class);\r
\r
public static final TermRepresentationUpdater NewInstance(List<ISchemaUpdaterStep> stepList,\r
String stepName, UUID uuidTerm, String description, String label, String abbrev,\r
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
public class TreeIndexUpdater\r
extends AuditedSchemaUpdaterStepBase {\r
\r
- private static final Logger logger = Logger.getLogger(TreeIndexUpdater.class);\r
+ private static final Logger logger = LogManager.getLogger(TreeIndexUpdater.class);\r
\r
private String indexColumnName = "treeIndex";\r
private final String treeIdColumnName;\r
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
*/\r
public class UniqueIndexDropper extends AuditedSchemaUpdaterStepBase {\r
\r
- private static final Logger logger = Logger.getLogger(UniqueIndexDropper.class);\r
+ private static final Logger logger = LogManager.getLogger(UniqueIndexDropper.class);\r
\r
private final String indexColumn;\r
\r
import java.sql.SQLException;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
public abstract class UpdaterBase<T extends ISchemaUpdaterStep, U extends IUpdater<U>>\r
implements IUpdater<U> {\r
\r
- private static final Logger logger = Logger.getLogger(UpdaterBase.class);\r
+ private static final Logger logger = LogManager.getLogger(UpdaterBase.class);\r
\r
protected List<T> list;\r
protected String startVersion;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
public class VocabularyCreator extends SchemaUpdaterStepBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(VocabularyCreator.class);\r
+ private static final Logger logger = LogManager.getLogger(VocabularyCreator.class);\r
\r
// **************************** STATIC METHODS ********************************/\r
\r
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class FeatureNodeTreeColumnUpdater
extends SchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(FeatureNodeTreeColumnUpdater.class);
+ private static final Logger logger = LogManager.getLogger(FeatureNodeTreeColumnUpdater.class);
private String treeTableName;
private String nodeTableName;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*
*/
public class PolytomousKeyDataMover extends SchemaUpdaterStepBase implements ISchemaUpdaterStep {
- private static final Logger logger = Logger.getLogger(PolytomousKeyDataMover.class);
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyDataMover.class);
private String featureTreeTableName;
private String featureNodeTableName;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
*/
public class SchemaUpdater_24_25 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_24_25.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_24_25.class);
private static final String startSchemaVersion = "2.4.1.2.201004231015";
private static final String endSchemaVersion = "2.5.0.0.201009211255";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_25_30.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_25_30.class);
private static final String startSchemaVersion = "2.5.0.0.201009211255";
private static final String endSchemaVersion = "3.0.0.0.201011090000";
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
public class SequenceTableCreator extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SequenceTableCreator.class);
+ private static final Logger logger = LogManager.getLogger(SequenceTableCreator.class);
// TODO These values are configurable in the enhanced.TableGenerator
// can we retrieve these values from the identity generator directly?
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* @since 15.12.2013
*/
public class ClassificationRootNodeUpdater extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(ClassificationRootNodeUpdater.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationRootNodeUpdater.class);
private static final String stepName = "Update Classification Root Nodes";
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class LanguageLabelUpdater extends SchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(LanguageLabelUpdater.class);
+ private static final Logger logger = LogManager.getLogger(LanguageLabelUpdater.class);
private static final String stepName = "Update language labels by full language name";
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* @since 15.12.2013
*/
public class RankClassUpdater extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(RankClassUpdater.class);
+ private static final Logger logger = LogManager.getLogger(RankClassUpdater.class);
private static final String stepName = "Update rank class values";
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* @since 25.04.2016
*/
public class ReferencedObjTypeUpdater extends SchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(ReferencedObjTypeUpdater.class);
+ private static final Logger logger = LogManager.getLogger(ReferencedObjTypeUpdater.class);
private static final String stepName = "Update referenced obj_type";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_30_301.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_30_301.class);
private static final String startSchemaVersion = "3.0.0.0.201011090000";
private static final String endSchemaVersion = "3.0.1.0.201104190000";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ClassChanger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
*/
public class SchemaUpdater_31_33 extends SchemaUpdaterBase {
- private static final Logger logger = Logger
- .getLogger(SchemaUpdater_31_33.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_31_33.class);
private static final String startSchemaVersion = "3.0.1.0.201104190000";
private static final String endSchemaVersion = "3.3.0.0.201309240000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_331_34 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_331_34.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_331_34.class);
private static final String startSchemaVersion = "3.3.1.0.201401140000";
private static final String endSchemaVersion = "3.4.0.0.201407010000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_33_331 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_33_331.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_33_331.class);
private static final String startSchemaVersion = "3.3.0.0.201309240000";
private static final String endSchemaVersion = "3.3.1.0.201401140000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ClassBaseTypeUpdater;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
public class SchemaUpdater_341_35 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_341_35.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_341_35.class);
private static final String startSchemaVersion = "3.4.1.0.201411210000";
private static final String endSchemaVersion = "3.5.0.0.201531030000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnRemover;
public class SchemaUpdater_34_341 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_34_341.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_34_341.class);
private static final String endSchemaVersion = "3.4.1.0.201411210000";
private static final String startSchemaVersion = "3.4.0.0.201407010000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_35_36 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_35_36.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_35_36.class);
private static final String startSchemaVersion = "3.5.0.0.201531030000";
private static final String endSchemaVersion = "3.6.0.0.201527040000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_36_40 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_36_40.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_36_40.class);
private static final String endSchemaVersion = "4.0.0.0.201604200000";
private static final String startSchemaVersion = "3.6.0.0.201527040000";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class SpecimenMediaMoverUpdater
extends SchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(SpecimenMediaMoverUpdater.class);
+ private static final Logger logger = LogManager.getLogger(SpecimenMediaMoverUpdater.class);
private static final String stepName = "Update rank class values";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import au.com.bytecode.opencsv.CSVReader;
import eu.etaxonomy.cdm.common.CdmUtils;
public class TermVocabularyRepresentationUpdater
extends SchemaUpdaterStepBase{
- private static final Logger logger = Logger.getLogger(TermVocabularyRepresentationUpdater.class);
+ private static final Logger logger = LogManager.getLogger(TermVocabularyRepresentationUpdater.class);
private static final String stepName = "Update term vocabulary representations";
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
*/
public class UsernameConstraintUpdater
extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(UsernameConstraintUpdater.class);
+ private static final Logger logger = LogManager.getLogger(UsernameConstraintUpdater.class);
private String tableName;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
*/
public class InitialsUpdater extends SchemaUpdaterStepBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(InitialsUpdater.class);
+ private static final Logger logger = LogManager.getLogger(InitialsUpdater.class);
/**
* @return
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class NomStatusInvalidUpdater extends SchemaUpdaterStepBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NomStatusInvalidUpdater.class);
+ private static final Logger logger = LogManager.getLogger(NomStatusInvalidUpdater.class);
/**
* @return
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* @since 13.10.2016
*/
public class NomenclaturalCodeUpdater extends SchemaUpdaterStepBase {
- private static final Logger logger = Logger.getLogger(NomenclaturalCodeUpdater.class);
+ private static final Logger logger = LogManager.getLogger(NomenclaturalCodeUpdater.class);
private static final String stepName = "Update nomenclatural code";
import java.sql.SQLException;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class OrphanedKeyStatementRemover extends SchemaUpdaterStepBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OrphanedKeyStatementRemover.class);
+ private static final Logger logger = LogManager.getLogger(OrphanedKeyStatementRemover.class);
/**
* @return
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class ProParteSynonymUpdater extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ProParteSynonymUpdater.class);
+ private static final Logger logger = LogManager.getLogger(ProParteSynonymUpdater.class);
private static final String stepName = "Make pro parte synonyms concept relationships";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.UTF8;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
public class SchemaUpdater_40_41 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_40_41.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_40_41.class);
private static final String endSchemaVersion = "4.1.0.0.201607300000";
private static final String startSchemaVersion = "4.0.0.0.201604200000";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_41_47 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_41_47.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_41_47.class);
private static final String startSchemaVersion = "4.1.0.0.201607300000";
private static final String endSchemaVersion = "4.7.0.0.201710040000";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
import eu.etaxonomy.cdm.database.update.ClassBaseTypeUpdater;
public class SchemaUpdater_47_50 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_47_50.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_47_50.class);
private static final String endSchemaVersion = "5.0.0.0.20180514";
private static final String startSchemaVersion = "4.7.0.0.201710040000";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
extends SchemaUpdaterStepBase{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SynonymDeduplicator.class);
+ private static final Logger logger = LogManager.getLogger(SynonymDeduplicator.class);
/**
* @return
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
*/
public class VocabularyOrderUpdater extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(VocabularyOrderUpdater.class);
+ private static final Logger logger = LogManager.getLogger(VocabularyOrderUpdater.class);
private static final String stepName = "Update vocabulary order";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class FeatureTreeMover extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(FeatureTreeMover.class);
+ private static final Logger logger = LogManager.getLogger(FeatureTreeMover.class);
private static final String stepName = "Move FeatureTree to TermCollection";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.UTF8;
import eu.etaxonomy.cdm.database.update.AllowNullUpdater;
public class SchemaUpdater_55_58 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_55_58.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_55_58.class);
private static final String startSchemaVersion = "5.5.0.0.20190221";
private static final String endSchemaVersion = "5.8.0.0.201906020";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_581_582 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_581_582.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_581_582.class);
private static final String endSchemaVersion = "5.8.2.0.20190815";
private static final String startSchemaVersion = "5.8.1.0.20190813";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_58_581 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_58_581.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_58_581.class);
private static final String endSchemaVersion = "5.8.1.0.20190813";
private static final String startSchemaVersion = "5.8.0.0.201906020";
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(UsernameRegexAdapter.class);
+ private static final Logger logger = LogManager.getLogger(UsernameRegexAdapter.class);
private static final String stepName = "Adapt username to username regex";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5111_5112 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5111_5112.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5111_5112.class);
private static final String startSchemaVersion = "5.11.1.0.20191108";
private static final String endSchemaVersion = "5.11.2.0.20191109";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_511_5111 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_511_5111.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_511_5111.class);
private static final String startSchemaVersion = "5.11.0.0.20191104";
private static final String endSchemaVersion = "5.11.1.0.20191108";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_582_511 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_582_511.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_582_511.class);
private static final String endSchemaVersion = "5.11.0.0.20191104";
private static final String startSchemaVersion = "5.8.2.0.20190815";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.UTF8;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
public class SchemaUpdater_50_55 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_50_55.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_50_55.class);
private static final String startSchemaVersion = "5.0.0.0.20180514";
private static final String endSchemaVersion = "5.5.0.0.20190221";
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnTypeChanger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5112_5120 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5112_5120.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5112_5120.class);
private static final String endSchemaVersion = "5.12.0.0.20191202";
private static final String startSchemaVersion = "5.11.2.0.20191109";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class Reference2SourceMover extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Reference2SourceMover.class);
+ private static final Logger logger = LogManager.getLogger(Reference2SourceMover.class);
private final String tableName;
private final String citationsIdAttr;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_5120_5150 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5120_5150.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5120_5150.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_12_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_15_00;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnRemover;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5150_5151 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5150_5151.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5150_5151.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_15_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_15_01;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5151_5152 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5151_5152.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5151_5152.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_15_01;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_15_02;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class AltitudeMeterCorrector extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AltitudeMeterCorrector.class);
+ private static final Logger logger = LogManager.getLogger(AltitudeMeterCorrector.class);
private final UUID uuidFeature = Feature.uuidAltitude;
private final UUID uuidUnit = MeasurementUnit.uuidMeter;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class OriginalSpellingMover extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OriginalSpellingMover.class);
+ private static final Logger logger = LogManager.getLogger(OriginalSpellingMover.class);
private static final String stepName = "Move original spelling to nomenclatural source";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class ProtologMover extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ProtologMover.class);
+ private static final Logger logger = LogManager.getLogger(ProtologMover.class);
private static final String stepName = "Move protologues to nomenclatural source";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class RecommendedMeasurementUnitAdder extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RecommendedMeasurementUnitAdder.class);
+ private static final Logger logger = LogManager.getLogger(RecommendedMeasurementUnitAdder.class);
private final UUID uuidFeature;
private final UUID uuidUnit;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnRemover;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5152_5180 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5152_5180.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5152_5180.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_15_02;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_00;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5180_5181 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5180_5181.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5180_5181.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_01;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5181_5182 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5181_5182.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5181_5182.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_01;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_02;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5182_5183 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5182_5183.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5182_5183.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_02;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_03;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5183_5184 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5183_5184.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5183_5184.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_03;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_04;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5184_5185 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5184_5185.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5184_5185.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_04;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_18_05;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5185_5186 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5185_5186.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5185_5186.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_05;
//FIXME
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_5186_5220 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5186_5220.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5186_5220.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_18_06;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_22_00;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public class SecReference2SourceMover extends SchemaUpdaterStepBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SecReference2SourceMover.class);
+ private static final Logger logger = LogManager.getLogger(SecReference2SourceMover.class);
private final String tableName;
private final String citationsIdAttr;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnRemover;
public class SchemaUpdater_5220_5230 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5220_5230.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5220_5230.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_22_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_23_00;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnTypeChanger;
public class SchemaUpdater_5230_5250 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5230_5250.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5230_5250.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_23_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_25_00;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
public class SchemaUpdater_5250_5251 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5250_5251.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5250_5251.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_25_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_25_01;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ColumnAdder;
import eu.etaxonomy.cdm.database.update.ColumnNameChanger;
public class SchemaUpdater_5251_5270 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5251_5270.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5251_5270.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_25_01;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_27_00;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5270_5271 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5270_5271.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5270_5271.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_27_00;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_27_01;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
public class SchemaUpdater_5271_5290 extends SchemaUpdaterBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SchemaUpdater_5271_5290.class);
+ private static final Logger logger = LogManager.getLogger(SchemaUpdater_5271_5290.class);
private static final CdmVersion startSchemaVersion = CdmVersion.V_05_27_01;
private static final CdmVersion endSchemaVersion = CdmVersion.V_05_29_00;
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.persistence.dao;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
/**
* @author n.hoffmann
* @since Mar 11, 2010
- * @version 1.0
*/
@Component
public class MethodCacheImpl implements IMethodCache {
-
-// MethodUtils
-
+
+ // MethodUtils
+
private Map<MethodDescriptor, Method> methodMap = new HashMap<MethodDescriptor, Method>();
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.persistence.dao.IMethodCache#getMethod(java.lang.Class, java.lang.String, java.lang.Class)
- */
- public Method getMethod(Class clazz, String methodName, Class parameterType) {
- MethodDescriptor methodDescriptor = new MethodDescriptor(clazz, methodName, new Class[]{parameterType});
-
+ @Override
+ public Method getMethod(Class clazz, String methodName, Class parameterType) {
+ MethodDescriptor methodDescriptor = new MethodDescriptor(clazz, methodName, new Class[]{parameterType});
+
if(methodMap.containsKey(methodDescriptor)){
return methodMap.get(methodDescriptor);
}
-
+
Method method = getMethodInternal(clazz, methodName, parameterType);
if(method != null){
method.setAccessible(true);
}
// we also put null methods into the map to benefit from caching
put(methodDescriptor, method);
-
- return method;
+
+ return method;
}
-
+
/**
* Checks class hierarchy of the given class for a method that fits to the given name and parameter type
- *
+ *
* @param clazz
* @param methodName
* @param parameterType
if(clazz == null){
return null;
}
-
+
Method method = null;
-
+
for(Class includedType : getIncludedTypes(parameterType, new ArrayList<Class>())){
try {
method = clazz.getDeclaredMethod(methodName, includedType);
}catch (NoSuchMethodException e) {
- ;
- }
+
+ }
}
-
+
// if we have a method return it
if(method != null){
return method;
}
-
+
// recurse into superclass if no method was found
return getMethodInternal(clazz.getSuperclass(), methodName, parameterType);
}
-
+
/**
* Create a list containing the type and all supertypes of a given type
- *
+ *
* @param clazz
* @param classList
* @return
}
return getIncludedTypes(clazz.getSuperclass(), classList);
}
-
+
/**
* Fill the cache
- *
+ *
* @param methodDescriptor
* @param method
*/
private void put(MethodDescriptor methodDescriptor, Method method) {
methodMap.put(methodDescriptor, method);
}
-
+
/**
- *
* @author n.hoffmann
* @since Mar 11, 2010
- * @version 1.0
*/
private static class MethodDescriptor{
- private static final Logger logger = Logger
- .getLogger(MethodDescriptor.class);
-
+
/** An empty class array */
private static final Class[] emptyClassArray = new Class[0];
-
+
private Class clazz;
private String methodName;
private Class[] parameterTypes;
this.hashCode = methodName.length();
}
+
/**
* Checks for equality.
* @param object object to be tested for equality
* @return true, if the object describes the same Method.
*/
- public boolean equals(Object object) {
+ @Override
+ public boolean equals(Object object) {
if (!(object instanceof MethodDescriptor)) {
return false;
}
* determine equality.
* @return the string length of method name.
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
return hashCode;
- }
- }
-}
+ }
+ }
+}
\ No newline at end of file
*/\r
package eu.etaxonomy.cdm.persistence.dao.hibernate;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.collection.spi.PersistentCollection;\r
import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.CollectionProxy;\r
public class HibernateBeanInitializer<CDM extends CdmBase> extends AbstractBeanInitializer<CDM>{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(HibernateBeanInitializer.class);\r
+ private static final Logger logger = LogManager.getLogger(HibernateBeanInitializer.class);\r
\r
@Override\r
public Object initializeInstance(Object bean) {\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
public class AgentDaoImpl extends IdentifiableDaoBase<AgentBase> implements IAgentDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AgentDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(AgentDaoImpl.class);
public AgentDaoImpl() {
super(AgentBase.class);
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.query.Query;
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
implements IAnnotatableDao<T> {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(AnnotatableDaoBaseImpl.class);
+ private static Logger logger = LogManager.getLogger(AnnotatableDaoBaseImpl.class);
public AnnotatableDaoBaseImpl(Class<T> type) {
super(type);
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Criteria;\r
import org.hibernate.FlushMode;\r
import org.hibernate.HibernateException;\r
extends DaoBase\r
implements ICdmEntityDao<T> {\r
\r
- private static final Logger logger = Logger.getLogger(CdmEntityDaoBase.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmEntityDaoBase.class);\r
\r
protected int flushAfterNo = 1000; // large numbers may cause synchronisation errors\r
// when commiting the session\r
import javax.persistence.EntityManagerFactory;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
extends CdmEntityDaoBase<CdmBase>
implements ICdmGenericDao{
- private static final Logger logger = Logger.getLogger(CdmGenericDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(CdmGenericDaoImpl.class);
private Set<Class<? extends CdmBase>> allCdmClasses = null;
private final Map<Class<? extends CdmBase>, Set<ReferenceHolder>> referenceMap = new HashMap<>();
import java.util.Optional;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.hibernate.Criteria;
public abstract class DaoBase {
- final static Logger logger = Logger.getLogger(DaoBase.class);
+ final static Logger logger = LogManager.getLogger(DaoBase.class);
public final static boolean NO_UNPUBLISHED = false; //constant for unpublished
public final static boolean INCLUDE_UNPUBLISHED = true; //constant for unpublished
import javax.naming.Reference;
import org.apache.commons.lang.UnhandledException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.MappingException;
import org.hibernate.Session;
import org.hibernate.internal.SessionFactoryImpl;
* @author a.mueller
*/
public class DeduplicationHelper {
- private static final Logger logger = Logger.getLogger(DeduplicationHelper.class);
+ private static final Logger logger = LogManager.getLogger(DeduplicationHelper.class);
private final SessionImpl session;
private final CdmGenericDaoImpl genericDao;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
implements IIdentifiableDao<T>{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IdentifiableDaoBase.class);
+ private static final Logger logger = LogManager.getLogger(IdentifiableDaoBase.class);
protected String defaultField = "titleCache_tokenized";
protected Class<? extends T> indexedClasses[];
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Criteria;\r
import org.springframework.stereotype.Repository;\r
\r
public class LanguageStringDaoImpl \r
extends LanguageStringBaseDaoImpl<LanguageString> implements ILanguageStringDao {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(LanguageStringDaoImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(LanguageStringDaoImpl.class);\r
\r
public LanguageStringDaoImpl() {\r
super(LanguageString.class); \r
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.stereotype.Repository;
public class RightsDaoImpl extends LanguageStringBaseDaoImpl<Rights> implements IRightsDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RightsDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(RightsDaoImpl.class);
public RightsDaoImpl(Class rightsClass) {
super(rightsClass);
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.criterion.Criterion;
import org.hibernate.envers.query.AuditEntity;
import org.hibernate.envers.query.AuditQuery;
import eu.etaxonomy.cdm.persistence.query.OrderHint;
public abstract class VersionableDaoBase<T extends VersionableEntity> extends CdmEntityDaoBase<T> implements IVersionableDao<T> {
- private static final Logger logger = Logger.getLogger(VersionableDaoBase.class);
+ private static final Logger logger = LogManager.getLogger(VersionableDaoBase.class);
public VersionableDaoBase(Class<T> type) {
super(type);
import java.util.UUID;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.ProjectionList;
extends IdentifiableDaoBase<DescriptionBase>
implements IDescriptionDao{
- private static final Logger logger = Logger.getLogger(DescriptionDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionDaoImpl.class);
public DescriptionDaoImpl() {
super(DescriptionBase.class);
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
@Repository
public class DescriptionElementDaoImpl extends AnnotatableDaoBaseImpl<DescriptionElementBase> implements IDescriptionElementDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DescriptionElementDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementDaoImpl.class);
private final String defaultField = "multilanguageText.text";
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
extends IdentifiableDaoBase<DescriptiveDataSet>
implements IDescriptiveDataSetDao {
- private static final Logger logger = Logger.getLogger(DescriptiveDataSetDao.class);
+ private static final Logger logger = LogManager.getLogger(DescriptiveDataSetDao.class);
@Autowired
private ITermTreeDao termTreeDao;
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Criteria;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Repository;\r
public class PolytomousKeyDaoImpl extends IdentifiableDaoBase<PolytomousKey> implements IPolytomousKeyDao {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PolytomousKeyDaoImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyDaoImpl.class);\r
\r
@Autowired\r
IPolytomousKeyNodeDao nodeDao;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
import org.hibernate.query.Query;
public class AmplificationDaoHibernateImpl extends AnnotatableDaoBaseImpl<Amplification> implements IAmplificationDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AmplificationDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(AmplificationDaoHibernateImpl.class);
/**
* @param type
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
import org.hibernate.query.Query;
public class PrimerDaoHibernateImpl extends AnnotatableDaoBaseImpl<Primer> implements IPrimerDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PrimerDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(PrimerDaoHibernateImpl.class);
public PrimerDaoHibernateImpl() {
super(Primer.class);
*/
package eu.etaxonomy.cdm.persistence.dao.hibernate.molecular;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Repository;
import eu.etaxonomy.cdm.model.molecular.Sequence;
public class SequenceDaoHibernateImpl extends AnnotatableDaoBaseImpl<Sequence> implements ISequenceDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SequenceDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(SequenceDaoHibernateImpl.class);
/**
* @param type
*/
package eu.etaxonomy.cdm.persistence.dao.hibernate.molecular;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Repository;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
public class SingleReadDaoHibernateImpl extends AnnotatableDaoBaseImpl<SingleRead> implements ISingleReadDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SingleReadDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(SingleReadDaoHibernateImpl.class);
/**
* @param type
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.query.Query;\r
import org.springframework.stereotype.Repository;\r
\r
public class HomotypicalGroupDaoHibernateImpl extends CdmEntityDaoBase<HomotypicalGroup> implements IHomotypicalGroupDao {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(HomotypicalGroupDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(HomotypicalGroupDaoHibernateImpl.class);\r
\r
public HomotypicalGroupDaoHibernateImpl() {\r
super(HomotypicalGroup.class);\r
*/\r
package eu.etaxonomy.cdm.persistence.dao.hibernate.name;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Repository;\r
\r
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
implements INomenclaturalStatusDao {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NomenclaturalStatusDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(NomenclaturalStatusDaoHibernateImpl.class);\r
\r
public NomenclaturalStatusDaoHibernateImpl() {\r
super(NomenclaturalStatus.class);\r
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.query.Query;
import org.springframework.stereotype.Repository;
implements IRegistrationDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RegistrationDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(RegistrationDaoHibernateImpl.class);
public RegistrationDaoHibernateImpl() {
super(Registration.class);
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.LogicalExpression;
@Qualifier("taxonNameDaoHibernateImpl")
public class TaxonNameDaoHibernateImpl extends IdentifiableDaoBase<TaxonName> implements ITaxonNameDao {
- private static final Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNameDaoHibernateImpl.class);
@Autowired
private ITaxonDao taxonDao;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.query.Query;
import org.springframework.stereotype.Repository;
implements ITypeDesignationDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TypeDesignationDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(TypeDesignationDaoHibernateImpl.class);
public TypeDesignationDaoHibernateImpl() {
super((Class)(TypeDesignationBase.class));
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Criteria;\r
import org.hibernate.Hibernate;\r
import org.hibernate.Session;\r
extends IdentifiableDaoBase<SpecimenOrObservationBase>\r
implements IOccurrenceDao {\r
\r
- private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonDaoHibernateImpl.class);\r
\r
@Autowired\r
private IDescriptionDao descriptionDao;\r
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
implements IOriginalSourceDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OriginalSourceDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(OriginalSourceDaoImpl.class);
public OriginalSourceDaoImpl() {
super(OriginalSourceBase.class);
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Hibernate;
import org.hibernate.Session;
@Repository
@Qualifier("referenceDaoHibernateImpl")
public class ReferenceDaoHibernateImpl extends IdentifiableDaoBase<Reference> implements IReferenceDao {
- private static final Logger logger = Logger.getLogger(ReferenceDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceDaoHibernateImpl.class);
public ReferenceDaoHibernateImpl() {
super(Reference.class);
+/**
+* Copyright (C) 2009 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
package eu.etaxonomy.cdm.persistence.dao.hibernate.statistics;
import java.util.ArrayList;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
* @author s.buers
*
*/
-
@Repository
public class StatisticsDaoHibernateImpl
extends DaoBase
private static final int REFERENCE_LINK_RECURSION_DEPTH = 1;
@SuppressWarnings("unused")
- private static final Logger logger = Logger
- .getLogger(StatisticsDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(StatisticsDaoHibernateImpl.class);
@Override
public Long countDescriptiveSourceReferences() {
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.query.Query;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.beans.factory.annotation.Qualifier;\r
extends IdentifiableDaoBase<Classification>\r
implements IClassificationDao {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ClassificationDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(ClassificationDaoHibernateImpl.class);\r
\r
@Autowired\r
private ITaxonNodeDao taxonNodeDao;\r
import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.FetchMode;
import org.hibernate.Hibernate;
extends IdentifiableDaoBase<TaxonBase>
implements ITaxonDao {
// private AlternativeSpellingSuggestionParser<TaxonBase> alternativeSpellingSuggestionParser;
- private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(TaxonDaoHibernateImpl.class);
public TaxonDaoHibernateImpl() {
super(TaxonBase.class);
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Criteria;\r
import org.hibernate.Hibernate;\r
import org.hibernate.criterion.Projections;\r
public class TaxonNodeDaoHibernateImpl extends AnnotatableDaoBaseImpl<TaxonNode>\r
implements ITaxonNodeDao {\r
\r
- private static final Logger logger = Logger.getLogger(TaxonNodeDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonNodeDaoHibernateImpl.class);\r
\r
private static final int DEFAULT_SET_SUBTREE_PARTITION_SIZE = 100;\r
\r
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.query.Query;
*/
public abstract class AbstractHibernateTaxonGraphProcessor {
- private static final Logger logger = Logger.getLogger(AbstractHibernateTaxonGraphProcessor.class);
+ private static final Logger logger = LogManager.getLogger(AbstractHibernateTaxonGraphProcessor.class);
private EnumSet<ReferenceType> referenceSectionTypes = EnumSet.of(ReferenceType.Section, ReferenceType.BookSection);
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.beans.factory.InitializingBean;
implements ITaxonGraphDao, InitializingBean {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonGraphDaoHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(TaxonGraphDaoHibernateImpl.class);
public TaxonGraphDaoHibernateImpl(IPreferenceDao preferenceDao) {
super(preferenceDao);
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
extends IdentifiableDaoBase<DefinedTermBase>
implements IDefinedTermDao{
- private static final Logger logger = Logger.getLogger(DefinedTermDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(DefinedTermDaoImpl.class);
@SuppressWarnings("unchecked")
public DefinedTermDaoImpl() {
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.springframework.stereotype.Repository;
public class RepresentationDaoImpl
extends LanguageStringBaseDaoImpl<Representation> implements IRepresentationDao {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(RepresentationDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(RepresentationDaoImpl.class);
public RepresentationDaoImpl() {
super(Representation.class);
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.query.Query;
public class TermTreeDaoImpl extends IdentifiableDaoBase<TermTree> implements ITermTreeDao{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermTreeDaoImpl.class);
+ private static final Logger logger = LogManager.getLogger(TermTreeDaoImpl.class);
@Autowired
private ITermVocabularyDao termVocabularyDao;
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.query.Query;\r
import org.springframework.beans.factory.annotation.Qualifier;\r
import org.springframework.stereotype.Repository;\r
IEntityConstraintViolationDao {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(EntityConstraintViolationHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(EntityConstraintViolationHibernateImpl.class);\r
\r
public EntityConstraintViolationHibernateImpl() {\r
super(EntityConstraintViolation.class);\r
\r
import javax.validation.ConstraintViolation;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.query.Query;\r
import org.springframework.beans.factory.annotation.Qualifier;\r
import org.springframework.stereotype.Repository;\r
public class EntityValidationDaoHibernateImpl extends CdmEntityDaoBase<EntityValidation> implements\r
IEntityValidationDao {\r
\r
- private static final Logger logger = Logger.getLogger(EntityValidationDaoHibernateImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(EntityValidationDaoHibernateImpl.class);\r
\r
public EntityValidationDaoHibernateImpl() {\r
super(EntityValidation.class);\r
\r
import org.apache.commons.beanutils.PropertyUtils;\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public abstract class AbstractBeanInitializer<CDM extends CdmBase> implements IBeanInitializer{\r
\r
- public static final Logger logger = Logger.getLogger(AbstractBeanInitializer.class);\r
+ public static final Logger logger = LogManager.getLogger(AbstractBeanInitializer.class);\r
\r
@Autowired\r
private IMethodCache methodCache;\r
import java.util.Set;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.Query;
*/
public class AdvancedBeanInitializer<CDM extends CdmBase> extends HibernateBeanInitializer<CDM> {
- public static final Logger logger = Logger.getLogger(AdvancedBeanInitializer.class);
+ public static final Logger logger = LogManager.getLogger(AdvancedBeanInitializer.class);
@Autowired
private ICdmGenericDao genericDao;
import java.sql.SQLException;\r
import java.sql.Statement;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author ayco_holleman\r
*/\r
public class JdbcDaoUtils {\r
\r
- private static final Logger logger = Logger.getLogger(JdbcDaoUtils.class);\r
+ private static final Logger logger = LogManager.getLogger(JdbcDaoUtils.class);\r
\r
\r
/**\r
import javax.sql.DataSource;
import javax.validation.ConstraintViolation;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@Repository
public class EntityValidationCrudJdbcImpl implements IEntityValidationCrud {
- public static final Logger logger = Logger.getLogger(EntityValidationCrudJdbcImpl.class);
+ public static final Logger logger = LogManager.getLogger(EntityValidationCrudJdbcImpl.class);
private static final String SQL_INSERT_VALIDATION_RESULT = "INSERT INTO entityvalidation"
+ "(id, created, uuid, crudeventtype, validatedentityclass, validatedentityid,"
import java.util.Comparator;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.AbstractStringComparator;
import eu.etaxonomy.cdm.common.UTF8;
private static final String HYBRID_SIGN = UTF8.HYBRID.toString();
- private static final Logger logger = Logger.getLogger(TaxonNodeByNameComparator.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeByNameComparator.class);
private boolean ignoreHybridSign = true;
private boolean sortInfraGenericFirst = true;
\r
package eu.etaxonomy.cdm.persistence.fetch;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
\r
/**\r
* @version 1.0\r
*/\r
public class CdmFetch {\r
- private static final Logger logger = Logger.getLogger(CdmFetch.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmFetch.class);\r
\r
public static CdmFetch NO_FETCH() {return new CdmFetch(0);}\r
public static CdmFetch FETCH_NOTHING() {return new CdmFetch(0);}\r
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.event.spi.MergeEvent;
import org.hibernate.event.spi.MergeEventListener;
public class CacheStrategyGenerator implements SaveOrUpdateEventListener, MergeEventListener {
private static final long serialVersionUID = -5511287200489449838L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CacheStrategyGenerator.class);
+ private static final Logger logger = LogManager.getLogger(CacheStrategyGenerator.class);
@Override
public void onSaveOrUpdate(SaveOrUpdateEvent event) throws HibernateException {
import java.io.Serializable;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.event.spi.AbstractEvent;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.PostDeleteEvent;
*/
public class CdmDataChangeEvent extends AbstractEvent{
private static final long serialVersionUID = 9113025682352080372L;
- private static final Logger logger = Logger.getLogger(CdmDataChangeEvent.class);
+ private static final Logger logger = LogManager.getLogger(CdmDataChangeEvent.class);
/**
* The event types currently implemented
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.persistence.hibernate;
import java.util.Collection;
import java.util.Set;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
/**
* @author n.hoffman
* @since 09.04.2009
- * @version 1.0
*/
public class CdmDataChangeMap implements Map<EventType, Vector<CdmDataChangeEvent>>{
- private static final Logger logger = Logger
- .getLogger(CdmDataChangeMap.class);
+
+ @SuppressWarnings("unused")
+ private static final Logger logger = LogManager.getLogger(CdmDataChangeMap.class);
private Map<EventType, Vector<CdmDataChangeEvent>> dataChangeMap;
\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.event.spi.DeleteEvent;\r
import org.hibernate.event.spi.DeleteEventListener;\r
public class CdmDeleteListener implements DeleteEventListener {\r
\r
private static final long serialVersionUID = -5511287200489449838L;\r
- protected static final Logger logger = Logger.getLogger(CdmDeleteListener.class);\r
+ protected static final Logger logger = LogManager.getLogger(CdmDeleteListener.class);\r
\r
@Override\r
public void onDelete(DeleteEvent event) throws HibernateException {\r
import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.EmptyInterceptor;
import org.hibernate.Transaction;
import org.hibernate.resource.transaction.spi.TransactionStatus;
@Component
public class CdmHibernateInterceptor extends EmptyInterceptor {
private static final long serialVersionUID = 2536017420460052854L;
- private static final Logger logger = Logger.getLogger(CdmHibernateInterceptor.class);
+ private static final Logger logger = LogManager.getLogger(CdmHibernateInterceptor.class);
//FIXME problem is circular dependency (see VocabularyStoreImpl.staticInitialized
// @Autowired
*/
package eu.etaxonomy.cdm.persistence.hibernate;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.boot.Metadata;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.event.service.spi.EventListenerRegistry;
*
*/
public class CdmListenerIntegrator implements Integrator {
- private static final Logger logger = Logger.getLogger(CdmListenerIntegrator.class);
+ private static final Logger logger = LogManager.getLogger(CdmListenerIntegrator.class);
@Override
public void integrate(Metadata metadata,
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.event.spi.PostDeleteEvent;
import org.hibernate.event.spi.PostDeleteEventListener;
import org.hibernate.event.spi.PostInsertEvent;
{
private static final long serialVersionUID = -8764348096490526927L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmPostDataChangeObservableListener.class);
+ private static final Logger logger = LogManager.getLogger(CdmPostDataChangeObservableListener.class);
/**
* if this is set to true, observers have to be notified manually by calling
import java.util.Set;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.EmptyInterceptor;
import org.hibernate.type.Type;
import org.springframework.security.core.context.SecurityContextHolder;
private static final long serialVersionUID = 8477758472369568074L;
- public static final Logger logger = Logger.getLogger(CdmSecurityHibernateInterceptor.class);
+ public static final Logger logger = LogManager.getLogger(CdmSecurityHibernateInterceptor.class);
private ICdmPermissionEvaluator permissionEvaluator;
*/
package eu.etaxonomy.cdm.persistence.hibernate;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.persister.entity.EntityPersister;
import eu.etaxonomy.cdm.model.common.ICdmBase;
public class Level2ValidationEventListener extends ValidationEventListenerBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Level2ValidationEventListener.class);
+ private static final Logger logger = LogManager.getLogger(Level2ValidationEventListener.class);
public Level2ValidationEventListener(IEntityValidationCrud dao){
super(dao);
*/
package eu.etaxonomy.cdm.persistence.hibernate;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.event.spi.PostDeleteEvent;
import org.hibernate.event.spi.PostDeleteEventListener;
import org.hibernate.persister.entity.EntityPersister;
implements PostDeleteEventListener {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(Level3ValidationEventListener.class);
+ private static final Logger logger = LogManager.getLogger(Level3ValidationEventListener.class);
public Level3ValidationEventListener(IEntityValidationCrud dao) {
super(dao);
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.LazyInitializationException;
private static final long serialVersionUID = 1565797119368313987L;
private static Map<Session, Set<CdmBase>> newEntitiesMap = new ConcurrentHashMap<>();
- private static final Logger logger = Logger.getLogger(PostMergeEntityListener.class);
+ private static final Logger logger = LogManager.getLogger(PostMergeEntityListener.class);
public static void addSession(Session session) {
newEntitiesMap.put(session, new HashSet<>());
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.MappingException;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.Type;
//see also TableGeneratorGlobalOverride
public class TableGenerator extends org.hibernate.id.enhanced.TableGenerator {
- private static final Logger logger = Logger.getLogger(TableGenerator.class);
+ private static final Logger logger = LogManager.getLogger(TableGenerator.class);
@Override
public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.action.spi.BeforeTransactionCompletionProcess;
import org.hibernate.event.spi.PostInsertEvent;
import org.hibernate.event.spi.PostUpdateEvent;
*
* @author a.kohlbecker
* @since Sep 27, 2018
- *
*/
public class TaxonGraphHibernateListener implements ITaxonGraphHibernateListener {
+ private static final Logger logger = LogManager.getLogger(TaxonGraphHibernateListener.class);
+
private static final long serialVersionUID = 5062518307839173935L;
private Map<Class<? extends BeforeTransactionCompletionProcess>, ProcessConstructorData<? extends BeforeTransactionCompletionProcess>> beforeTransactionCompletionProcessTypes = new HashMap<>();
event.getSession().getActionQueue().registerProcess(processorInstance);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | SecurityException e) {
- Logger.getLogger(TaxonGraphHibernateListener.class).error("Error creating new instance of " + type.toString(), e);
+ logger.error("Error creating new instance of " + type.toString(), e);
}
}
}
event.getSession().getActionQueue().registerProcess(processorInstance);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | SecurityException e) {
- Logger.getLogger(TaxonGraphHibernateListener.class).error("Error creating new instance of " + type.toString(), e);
+ logger.error("Error creating new instance of " + type.toString(), e);
}
}
}
event.getSession().getActionQueue().registerProcess(processorInstance);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | SecurityException e) {
- Logger.getLogger(TaxonGraphHibernateListener.class).error("Error creating new instance of " + type.toString(), e);
+ logger.error("Error creating new instance of " + type.toString(), e);
}
}
}
\r
package eu.etaxonomy.cdm.persistence.hibernate;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.HibernateException;\r
import org.hibernate.event.spi.SaveOrUpdateEvent;\r
import org.hibernate.event.spi.SaveOrUpdateEventListener;\r
public class UpdateEntityListener implements SaveOrUpdateEventListener {\r
private static final long serialVersionUID = -3295612929556041686L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(UpdateEntityListener.class);\r
+ private static final Logger logger = LogManager.getLogger(UpdateEntityListener.class);\r
\r
@Override\r
public void onSaveOrUpdate(SaveOrUpdateEvent event) throws HibernateException {\r
\r
import java.util.HashMap;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.event.spi.PostInsertEvent;\r
import org.hibernate.event.spi.PostInsertEventListener;\r
import org.hibernate.event.spi.PostUpdateEvent;\r
*/\r
@SuppressWarnings("serial")\r
public abstract class ValidationEventListenerBase implements PostInsertEventListener, PostUpdateEventListener{\r
- private static final Logger logger = Logger.getLogger(ValidationEventListenerBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ValidationEventListenerBase.class);\r
\r
private ValidationExecutor validationExecutor;\r
\r
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.core.GrantedAuthority;
public class CdmAuthority implements GrantedAuthority, ConfigAttribute, IGrantedAuthorityConverter {
private static final long serialVersionUID = -41894743719582595L;
- public static final Logger logger = Logger.getLogger(CdmAuthority.class);
+ public static final Logger logger = LogManager.getLogger(CdmAuthority.class);
private static Map<String, CdmAuthority> grantedAuthorityCache = new HashMap<>();
import java.util.EnumSet;
import java.util.HashSet;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.access.AccessDecisionManager;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
@Component
public class CdmPermissionEvaluator implements ICdmPermissionEvaluator {
- protected static final Logger logger = Logger.getLogger(CdmPermissionEvaluator.class);
+ protected static final Logger logger = LogManager.getLogger(CdmPermissionEvaluator.class);
private AccessDecisionManager accessDecisionManager;
import java.util.Collection;
import java.util.EnumSet;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.access.AccessDecisionVoter;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.core.Authentication;
*/
public abstract class CdmPermissionVoter implements AccessDecisionVoter <TargetEntityStates> {
- public static final Logger logger = Logger.getLogger(CdmPermissionVoter.class);
+ public static final Logger logger = LogManager.getLogger(CdmPermissionVoter.class);
private static final EnumSet<CRUD> DELETE = EnumSet.of(CRUD.DELETE);
*/
package eu.etaxonomy.cdm.persistence.permission.voter;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
*/
public class TaxonBaseVoter extends CdmPermissionVoter {
- public static final Logger logger = Logger.getLogger(TaxonBaseVoter.class);
+ public static final Logger logger = LogManager.getLogger(TaxonBaseVoter.class);
@Override
public Class<? extends CdmBase> getResponsibilityClass() {
import java.util.Collection;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.access.ConfigAttribute;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
*/
public class TaxonNodeVoter extends CdmPermissionVoter {
- public static final Logger logger = Logger.getLogger(TaxonNodeVoter.class);
+ public static final Logger logger = LogManager.getLogger(TaxonNodeVoter.class);
@Override
public Class<? extends CdmBase> getResponsibilityClass() {
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.search.SortField;
import org.hibernate.Criteria;
import org.hibernate.criterion.Order;
}
}
- public static final Logger logger = Logger.getLogger(OrderHint.class);
+ public static final Logger logger = LogManager.getLogger(OrderHint.class);
private final String propertyName;
import javax.validation.ConstraintViolation;\r
import javax.validation.Validator;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.ICdmBase;\r
import eu.etaxonomy.cdm.model.validation.CRUDEventType;\r
*/\r
public abstract class EntityValidationTaskBase implements Runnable {\r
\r
- private static final Logger logger = Logger.getLogger(EntityValidationTaskBase.class);\r
+ private static final Logger logger = LogManager.getLogger(EntityValidationTaskBase.class);\r
\r
private final ICdmBase entity;\r
private final CRUDEventType crudEventType;\r
\r
import javax.validation.ConstraintValidator;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* A {@code ThreadPoolExecutor} specialized in dealing with\r
//maybe we want to make this a spring component ? #4663\r
public class ValidationExecutor extends ThreadPoolExecutor implements RejectedExecutionHandler {\r
\r
- private static final Logger logger = Logger.getLogger(ValidationExecutor.class);\r
+ private static final Logger logger = LogManager.getLogger(ValidationExecutor.class);\r
\r
// Number of threads to keep in the thread pool\r
static final int CORE_POOL_SIZE = 0;\r
import static org.junit.Assert.assertEquals;\r
import static org.junit.Assert.assertNotNull;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
import org.junit.Test;\r
* @since 18.12.2008\r
*/\r
public class CdmDataSourceTest {\r
- private static final Logger logger = Logger.getLogger(CdmDataSourceTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmDataSourceTest.class);\r
\r
private static String server;\r
private static String database;\r
import java.io.IOException;\r
import java.util.Properties;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.cache.internal.NoCachingRegionFactory;\r
import org.hibernate.cache.spi.RegionFactory;\r
import org.junit.After;\r
@Ignore\r
public class CdmPersistentDataSourceTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmPersistentDataSourceTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmPersistentDataSourceTest.class);\r
\r
private static CdmPersistentDataSource dataSource;\r
\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
*/
public class DatabaseTypeEnumTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DatabaseTypeEnumTest.class);
+ private static final Logger logger = LogManager.getLogger(DatabaseTypeEnumTest.class);
private static DatabaseTypeEnum dbEnum;
private static DatabaseTypeEnum dbEnumSql2005;
\r
import static org.junit.Assert.*;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class ODBCDatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ODBCDatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ODBCDatabaseTypeTest.class);\r
\r
static DatabaseTypeEnum enumType;\r
\r
\r
import static org.junit.Assert.assertEquals;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
*/\r
public class OracleDatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(OracleDatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(OracleDatabaseTypeTest.class);\r
\r
static DatabaseTypeEnum enumType;\r
\r
\r
import static org.junit.Assert.*;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class PostgreSQLDatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(PostgreSQLDatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PostgreSQLDatabaseTypeTest.class);\r
\r
CdmPersistentDataSource dataSource;\r
static DatabaseTypeEnum enumType;\r
\r
import static org.junit.Assert.*;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class SqlServer2000DatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SqlServer2000DatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(SqlServer2000DatabaseTypeTest.class);\r
\r
CdmPersistentDataSource dataSource;\r
static DatabaseTypeEnum enumType;\r
\r
import static org.junit.Assert.*;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class SqlServer2005DatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SqlServer2005DatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(SqlServer2005DatabaseTypeTest.class);\r
\r
CdmPersistentDataSource dataSource;\r
static DatabaseTypeEnum enumType;\r
\r
import static org.junit.Assert.*;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.After;\r
import org.junit.AfterClass;\r
import org.junit.Before;\r
*/\r
public class SybaseDatabaseTypeTest {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(SybaseDatabaseTypeTest.class);\r
+ private static final Logger logger = LogManager.getLogger(SybaseDatabaseTypeTest.class);\r
\r
static DatabaseTypeEnum enumType;\r
\r
import java.lang.reflect.Method;\r
import java.sql.SQLException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Ignore;\r
import org.junit.Test;\r
public class CdmUpdaterTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmUpdaterTest.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmUpdaterTest.class);\r
\r
// ******************** TESTS ****************************************************/\r
\r
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
public class MethodCacheImplTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(MethodCacheImplTest.class);
+ private static final Logger logger = LogManager.getLogger(MethodCacheImplTest.class);
private Taxon taxon;
private IBotanicalName botanicalName;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
public class AnnotationDaoTest extends CdmIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AnnotationDaoTest.class);
+ private static final Logger logger = LogManager.getLogger(AnnotationDaoTest.class);
@SpringBeanByType
private IAnnotationDao annotationDao;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class CdmEntityDaoBaseTest extends CdmTransactionalIntegrationTestWithSecurity {
- private static final Logger logger = Logger.getLogger(CdmEntityDaoBaseTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmEntityDaoBaseTest.class);
private UUID uuid;
private TaxonBase<?> cdmBase;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class CdmGenericDaoImplTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(CdmGenericDaoImplTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmGenericDaoImplTest.class);
@SpringBeanByType
private CdmGenericDaoImpl cdmGenericDao;
import java.util.Map;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
*
*/
public class DescriptionElementDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(DescriptionElementDaoHibernateImplTest.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementDaoHibernateImplTest.class);
@SpringBeanByType
IDescriptionElementDao descriptionElementDao;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
public class TypeDesignationDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TypeDesignationDaoHibernateImplTest.class);
+ private static final Logger logger = LogManager.getLogger(TypeDesignationDaoHibernateImplTest.class);
@SpringBeanByType
private ITypeDesignationDao typeDesignationDao;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.h2.util.StringUtils;
import org.junit.Assert;
import org.junit.Test;
public class OccurrenceDaoHibernateImplTest extends CdmIntegrationTest {
- private static final Logger logger = Logger.getLogger(OccurrenceDaoHibernateImplTest.class);
+ private static final Logger logger = LogManager.getLogger(OccurrenceDaoHibernateImplTest.class);
@SpringBeanByType
private IOccurrenceDao dao;
import java.util.UUID;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class StatisticsDaoHibernateImplTest
extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(StatisticsDaoHibernateImplTest.class);
+ private static final Logger logger = LogManager.getLogger(StatisticsDaoHibernateImplTest.class);
@SpringBeanByType
private IStatisticsDao statisticsDao;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.junit.Assert;
import org.junit.Test;
public class TaxonGraphTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonGraphTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonGraphTest.class);
enum EventType{
INSERT, UPDATE;
import java.io.FileNotFoundException;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class TermNodeDaoImplTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(TermNodeDaoImplTest.class);
+ private static Logger logger = LogManager.getLogger(TermNodeDaoImplTest.class);
@SpringBeanByType
private ITermTreeDao treeDao;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class TermVocabularyDaoImplTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(TermVocabularyDaoImplTest.class);
+ private static Logger logger = LogManager.getLogger(TermVocabularyDaoImplTest.class);
@SpringBeanByType
private ITermVocabularyDao dao;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.FlushMode;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
*/
public class AdvancedBeanInitializerTest<CDM extends CdmBase> extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(AdvancedBeanInitializerTest.class);
+ private static final Logger logger = LogManager.getLogger(AdvancedBeanInitializerTest.class);
private static final UUID personUuid = UUID.fromString("d0568bb1-4dc8-40dc-a405-d0b9e714a7a9");
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class CacheStrategyGeneratorTest extends CdmTransactionalIntegrationTest {
- private static Logger logger = Logger.getLogger(CacheStrategyGeneratorTest.class);
+ private static Logger logger = LogManager.getLogger(CacheStrategyGeneratorTest.class);
private TaxonBase<?> cdmBase;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.junit.Assert;
public class CdmDeleteListenerTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmDeleteListenerTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmDeleteListenerTest.class);
@SpringBeanByType
private ITaxonNameDao taxonNameDao;
import java.io.FileNotFoundException;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.springframework.security.authentication.AuthenticationManager;
public class Level2ValidationEventListenerTest extends CdmTransactionalIntegrationTest {
- protected static final Logger logger = Logger.getLogger(Level2ValidationEventListenerTest.class);
+ protected static final Logger logger = LogManager.getLogger(Level2ValidationEventListenerTest.class);
private UUID uuid;
private TaxonBase<?> cdmBase;
import java.io.FileNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class SaveOrUpdateEntityListenerTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SaveOrUpdateEntityListenerTest.class);
+ private static final Logger logger = LogManager.getLogger(SaveOrUpdateEntityListenerTest.class);
@SpringBeanByType
private OccurrenceDaoHibernateImpl occurrenceDao;
import java.io.FileNotFoundException;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
public class ReferringObjectMetadataFactoryTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(ReferringObjectMetadataFactoryTest.class);
+ private static Logger logger = LogManager.getLogger(ReferringObjectMetadataFactoryTest.class);
@SpringBeanByType
private ReferringObjectMetadataFactory referringObjectMetadataFactory;
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class ValidationExecutorTest {\r
\r
- public static final Logger logger = Logger.getLogger(ValidationExecutorTest.class);\r
+ public static final Logger logger = LogManager.getLogger(ValidationExecutorTest.class);\r
\r
\r
@Before\r
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.CdmApplicationUtils;
*/
public class TestCdmApplicationUtils {
- private static final Logger logger = Logger.getLogger(TestCdmApplicationUtils.class);
+ private static final Logger logger = LogManager.getLogger(TestCdmApplicationUtils.class);
private boolean testWritableResourceDirectory() throws IOException{
CdmApplicationUtils.getWritableResourceDir();
*/
package eu.etaxonomy.cdm.test.function;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
public class TestScriptPersistence {
- private static final Logger logger = Logger.getLogger(TestScriptPersistence.class);
+ private static final Logger logger = LogManager.getLogger(TestScriptPersistence.class);
private void test(){
System.out.println("Start Datasource");
package eu.etaxonomy.cdm.test.suite;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
)
public class CdmTestSuite {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmTestSuite.class);
+ private static final Logger logger = LogManager.getLogger(CdmTestSuite.class);
// the class remains completely empty,
// being used only as a holder for the above annotations
package eu.etaxonomy.cdm.test.suite;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
)
public class TestsShouldNotFailInSuite_1 {
- private static final Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_1.class);
+ private static final Logger logger = LogManager.getLogger(TestsShouldNotFailInSuite_1.class);
// the class remains completely empty,
// being used only as a holder for the above annotations
package eu.etaxonomy.cdm.test.suite;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
public class TestsShouldNotFailInSuite_2 {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_2.class);
+ private static final Logger logger = LogManager.getLogger(TestsShouldNotFailInSuite_2.class);
// the class remains completely empty,
// being used only as a holder for the above annotations
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.springframework.beans.factory.annotation.Autowired;
*/
@Component
public class LocalXMLEntityFactory extends XmlEntityFactoryBase {
- private static final Logger logger = Logger
- .getLogger(LocalXMLEntityFactory.class);
+
+ private static final Logger logger = LogManager.getLogger(LocalXMLEntityFactory.class);
private final JsonView xmlView;
/**
* Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
- *
+ *
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print;
import java.io.File;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
/**
* This class holds the complete configuration for the print publishing process.
* All aspects of the process are defined here.
- *
+ *
* @author n.hoffmann
* @since Aug 3, 2010
- * @version 1.0
*/
public class PublishConfigurator implements Serializable {
- private static final Logger logger = Logger
- .getLogger(PublishConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(PublishConfigurator.class);
private static final long serialVersionUID = 4896190792717383839L;
private boolean doSynonymy = true;
private boolean doDescriptions = true;
-
+
private boolean doPolytomousKey = true;
private UUID featureTreeUuid;
/**
* Creates a new instance connected to the given application controller.
- *
+ *
* @param applicationConfiguration
* @return
*/
/**
* Creates a new instance, ready to be connected to a CDM Community Stores
* access point.
- *
+ *
* @return
*/
public static PublishConfigurator NewRemoteInstance() {
/**
* Returns the CDM Community Stores access point connected to this
* configuration.
- *
+ *
* @return the access points url or null if this configurator is configured
* to be local.
*/
/**
* Returns a list of taxon node elements that should be processed by the
* print publisher.
- *
+ *
* @return a list of elements
*/
public List<Element> getSelectedTaxonNodeElements() {
/**
* Set the list of taxon node elements that should be processed by the print
* publisher.
- *
+ *
* @see {@link #getSelectedTaxonNodeElements()}
* @param selectedTaxonNodeElements
*/
/**
* Add a taxon node element to list of taxon nodes that will be processed by
* the print publisher.
- *
+ *
* @see {@link #getSelectedTaxonNodeElements()}
* @param selectedTaxonNodeElement
*/
/**
* Whether to export descriptions.
- *
+ *
* @return
*/
public boolean isDoDescriptions() {
/**
* Whether to export images
- *
+ *
* @return
*/
public boolean isDoImages() {
/**
* The folder, the produced output will be written to.
- *
+ *
* @return the exportFile
*/
public File getExportFolder() {
/**
* Returns a list of output modules. The print publisher will export into
* the formats defined by these output modules
- *
+ *
* @see {@link IPublishOutputModule} and implementations thereof
* @return the outputModules
*/
/**
* Adds an output modules to this configurators list of output modules.
- *
+ *
* @see {@link IPublishOutputModule} and implementations thereof
* @param module
*/
/**
* Whether this configurator is connected to a remote CDM Community Store
- *
+ *
* @return
*/
public boolean isRemote() {
/**
* Whether this configurator is connected to a local application controller.
- *
+ *
* @return
*/
public boolean isLocal() {
* Returns a {@link RemoteXMLEntityFactory} if <code>this</code> is a remote
* instance or a {@link LocalXMLEntityFactory} if <code>this</code> is a
* local instance
- *
+ *
* @return an {@link IXMLEntityFactory}
*/
public IXMLEntityFactory getFactory() {
/**
* FIXME this is a dummy implementation
- *
+ *
* @return
*/
public int calculateNumberOfNodes() {
* Whether taxonomically included taxa for the
* {@linkplain #getSelectedTaxonNodeElements() selected taxon nodes} should
* be exported recursively.
- *
+ *
* @return <code>true</code> if this is desired
*/
public boolean isDoPublishEntireBranches() {
/**
* Whether the synonymy should be exported.
- *
+ *
* @return <code>true</code> if this is desired
*/
public boolean isDoSynonymy() {
/**
* The {@linkplain CdmApplicationController application controller}
* associated with this instance
- *
+ *
* @return the {@link CdmApplicationController} or null if <code>this</code>
* is a {@linkplain #isRemote() remote} instance
*/
/**
* The feature tree configures which features and in which order and nesting
* will be exported by the application
- *
+ *
* @return the featureTrees uuid
*/
public UUID getFeatureTreeUuid() {
*/
package eu.etaxonomy.cdm.print;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import eu.etaxonomy.cdm.print.out.IPublishOutputModule;
* @version 1.0
*/
public class Publisher {
- private static final Logger logger = Logger.getLogger(Publisher.class);
+ private static final Logger logger = LogManager.getLogger(Publisher.class);
/**
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import eu.etaxonomy.cdm.common.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.xpath.XPath;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.print.XMLHelper.EntityType;
* @author n.hoffmann
* @author l.morris
* @since Apr 6, 2010
- * @version 1.0
*/
public class RemoteXMLEntityFactory extends XmlEntityFactoryBase {
- private static final Logger logger = Logger
- .getLogger(RemoteXMLEntityFactory.class);
+
+ private static final Logger logger = LogManager.getLogger(RemoteXMLEntityFactory.class);
private URL serviceUrl;
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print;
import java.io.IOException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.transform.JDOMResult;
import org.jdom.transform.JDOMSource;
/**
* Perform XSL transformations.
- *
- * Note: This class provides access to the JAXP XSL transformer currently active.
- *
+ *
+ * Note: This class provides access to the JAXP XSL transformer currently active.
+ *
* @author n.hoffmann
* @since Apr 20, 2010
- * @version 1.0
*/
public class Transformator {
- private static final Logger logger = Logger
- .getLogger(Transformator.class);
+ private static final Logger logger = LogManager.getLogger(Transformator.class);
private Transformer transformer;
-
+
public Transformator(InputStream stylesheet) throws XSLTransformException{
if(stylesheet == null){
throw new IllegalArgumentException("Stylsheet may not be null");
}
-
+
try {
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Templates templates = transformerFactory.newTemplates(new StreamSource(stylesheet));
}
catch (TransformerException e) {
throw new XSLTransformException("Could not construct XSLTransformer", e);
-
+
}
}
-
-
+
+
public Transformator(URL stylesheet) throws XSLTransformException, IOException {
this(stylesheet.openStream());
}
-
+
/**
* Transforms the given document to an output document.
*
JDOMResult result = new JDOMResult();
try {
logger.trace("Transforming input document: " + inputDocument);
-
+
transformer.transform(source, result);
Document resultDocument = result.getDocument();
-
+
resultDocument.getContent();
- return resultDocument;
+ return resultDocument;
}
catch (TransformerException e) {
logger.error(e);
import java.util.Locale;
import java.util.UUID;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
* @version 1.0
*/
public class XMLHarvester {
- private static final Logger logger = Logger.getLogger(XMLHarvester.class);
+ private static final Logger logger = LogManager.getLogger(XMLHarvester.class);
private IXMLEntityFactory factory;
*/
private void populateChildren(Element taxonNodeElement){
- logger.setLevel(Level.INFO);
logger.info("populating branch");
List<Element> childNodeElements = factory.getChildNodes(taxonNodeElement);
}
private void populatePolytomousKey(Element taxonElement){
- logger.setLevel(Level.INFO);
+
logger.info("populating Polytomous key");
logger.info("populating Polytomous key taxonElement " + XMLHelper.getUuid(taxonElement) + " name " + XMLHelper.getTitleCache(taxonElement));
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Text;
* @version 1.0
*/
public class XMLHelper {
- private static final Logger logger = Logger.getLogger(XMLHelper.class);
+ private static final Logger logger = LogManager.getLogger(XMLHelper.class);
public enum EntityType{
CLASSIFICATION("Classification"),
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
* @since Jul 16, 2010
*/
public abstract class XmlEntityFactoryBase implements IXMLEntityFactory {
- private static final Logger logger = Logger
- .getLogger(XmlEntityFactoryBase.class);
+
+ private static final Logger logger = LogManager.getLogger(XmlEntityFactoryBase.class);
/**
* A list of XML element names that are used to store collections
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print.out;
import java.io.File;
import java.util.Calendar;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
*
* @author n.hoffmann
* @since Apr 20, 2010
- * @version 1.0
*/
public abstract class PublishOutputModuleBase implements IPublishOutputModule {
- private static final Logger logger = Logger
- .getLogger(PublishOutputModuleBase.class);
+
+ private static final Logger logger = LogManager.getLogger(PublishOutputModuleBase.class);
/**
* The date format used by {@link #generateFilenameWithDate(String, String)}
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
package eu.etaxonomy.cdm.print.out.mediawiki;
import java.io.BufferedInputStream;
import javax.security.auth.login.LoginException;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
* TODO would we move this class somewhere else and/or rename it?
*
* @author s.buers, l.morris
- *
*/
public class Cdm2MediawikiExporter {
//-------------------
- private static final Logger logger = Logger
- .getLogger(Cdm2MediawikiExporter.class);
+ private static final Logger logger = LogManager.getLogger(Cdm2MediawikiExporter.class);
private PublishConfigurator configurator = PublishConfigurator.NewRemoteInstance();
/**\r
* Copyright (C) 2009 EDIT\r
- * European Distributed Institute of Taxonomy \r
+ * European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
- * \r
+ *\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
import javax.xml.transform.stream.StreamResult;\r
import javax.xml.transform.stream.StreamSource;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.jdom.Document;\r
import org.jdom.JDOMException;\r
import org.jdom.input.SAXBuilder;\r
/**\r
* @author l.morris, s.buers\r
* @since Sep 11, 2013\r
- * \r
*/\r
public class MediawikiOutputModule extends PublishOutputModuleBase {\r
\r
- private static final Logger logger = Logger\r
- .getLogger(MediawikiOutputModule.class);\r
+ private static final Logger logger = LogManager.getLogger(MediawikiOutputModule.class);\r
\r
public static String STYLESHEET_RESOURCE_DEFAULT = "src/main/resources/stylesheets/mediawiki/multipages.xsl";\r
- \r
- \r
+\r
// default wiki - exportparameter\r
public String prefix="";\r
public String sourceUrl="";\r
- public String username="CDM Mediawiki Exporter"; \r
- \r
+ public String username="CDM Mediawiki Exporter";\r
+\r
public MediawikiOutputModule(String mediaWikiPagePrefix, String sourceUrl){\r
super();\r
this.sourceUrl = sourceUrl;\r
this.prefix=mediaWikiPagePrefix+":";\r
}\r
- \r
- \r
+\r
+\r
public MediawikiOutputModule(String sourceUrl) {\r
super();\r
this.sourceUrl = sourceUrl;\r
}\r
\r
\r
- public void output(Document document, File exportFolder,\r
+ @Override\r
+ public void output(Document document, File exportFolder,\r
IProgressMonitor progressMonitor) {\r
\r
- \r
+\r
super.output(document, exportFolder, progressMonitor);\r
- \r
- \r
- \r
+\r
+\r
+\r
try {\r
\r
// URL xslURL = new\r
out = new java.io.BufferedOutputStream(out);\r
\r
// validate namespace\r
- \r
+\r
// System.setProperty("javax.xml.parsers.DocumentBuilderFactory",\r
// "net.sf.saxon.om.DocumentBuilderFactoryImpl");\r
DocumentBuilderFactory factory = DocumentBuilderFactory\r
// Result result = new SAXResult();\r
StreamResult result = new StreamResult(out);\r
\r
- // Run XSLT transformation \r
+ // Run XSLT transformation\r
transformer.setParameter("prefix", prefix);\r
transformer.setParameter("username", username);\r
transformer.setParameter("cdm-url", sourceUrl);\r
File xmlFile = new File("/home/sybille/development/mediawiki/kick_off/ericaceae_source.xml");\r
Document document1=null;\r
try {\r
- document1 = (Document) testbuilder.build(xmlFile);\r
+ document1 = testbuilder.build(xmlFile);\r
} catch (JDOMException e1) {\r
// TODO Auto-generated catch block\r
e1.printStackTrace();\r
\r
/*\r
* (non-Javadoc)\r
- * \r
+ *\r
* @see\r
* eu.etaxonomy.cdm.print.out.IPublishOutputModule#getOutputFileSuffix()\r
*/\r
return "xml";\r
}\r
\r
- public InputStream getDefaultXsltInputStream() {\r
+ @Override\r
+ public InputStream getDefaultXsltInputStream() {\r
return MediawikiOutputModule.class\r
.getResourceAsStream(STYLESHEET_RESOURCE_DEFAULT);\r
}\r
.NewRemoteInstance();\r
configurator.setExportFolder(new File("src/main/resources/tmp"));\r
// try out my own xml:\r
- \r
+\r
Document document = useExternalXMLSource();\r
\r
outputModule.output(document, configurator.getExportFolder(),\r
}\r
\r
// like this or change modifier in abstract superclass?\r
- public String generateFilenameWithDate(String name) {\r
+ @Override\r
+ public String generateFilenameWithDate(String name) {\r
return super.generateFilenameWithDate(name);\r
- \r
+\r
}\r
\r
}\r
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
package eu.etaxonomy.cdm.print.out.odf;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.output.DOMOutputter;
-import org.odftoolkit.odfdom.pkg.OdfFileDom;
import org.odftoolkit.odfdom.doc.OdfTextDocument;
import org.odftoolkit.odfdom.dom.element.office.OfficeTextElement;
import org.odftoolkit.odfdom.incubator.doc.office.OdfOfficeAutomaticStyles;
+import org.odftoolkit.odfdom.pkg.OdfFileDom;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- *
- * @author n.hoffmann
+ * @author n.hoffmann
* @since Apr 20, 2010
- * @version 1.0
*/
public class DocumentCreator {
- private static final Logger logger = Logger
- .getLogger(DocumentCreator.class);
-
+ private static final Logger logger = LogManager.getLogger(DocumentCreator.class);
+
private OdfTextDocument outputDocument;
private OdfFileDom contentDom; // the document object model for content.xml
private OdfFileDom stylesDom; // the document object model for styles.xml
DOMOutputter domOutputter = new DOMOutputter();
org.w3c.dom.Document output;
output = domOutputter.output(document);
-
+
Node firstChild = output.getFirstChild();
-
+
org.w3c.dom.Document officeDocument = officeText.getOwnerDocument();
-
-
+
+
Node node = officeDocument.importNode(firstChild, true);
NodeList childNodes = node.getChildNodes();
-
+
for (int i = 0; i < childNodes.getLength(); i++){
officeText.appendChild(childNodes.item(i));
}
-
+
return outputDocument;
}
return null;
outputDocument = OdfTextDocument.newTextDocument();
contentDom = outputDocument.getContentDom();
stylesDom = outputDocument.getStylesDom();
-
+
officeText = outputDocument.getContentRoot();
-
+
contentAutoStyles = contentDom.getOrCreateAutomaticStyles();
return true;
return false;
}
-
+
/*
* The default document has some content in it already (in the case of a
import java.io.File;
import java.io.InputStream;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.transform.XSLTransformException;
import org.odftoolkit.odfdom.doc.OdfTextDocument;
* @since Apr 20, 2010
*/
public class OdfOutputModule extends PublishOutputModuleBase {
- private static final Logger logger = Logger
- .getLogger(OdfOutputModule.class);
+
+ private static final Logger logger = LogManager.getLogger(OdfOutputModule.class);
public static String STYLESHEET_RESOURCE_DEFAULT = "/stylesheets/odf/cdmToOdfText.xsl";
*/
package eu.etaxonomy.cdm.print.out.odf;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.odftoolkit.odfdom.doc.OdfTextDocument;
import org.odftoolkit.odfdom.dom.element.OdfStyleBase;
import org.odftoolkit.odfdom.dom.element.style.StyleParagraphPropertiesElement;
*/
public class StylesFactory implements IStyleNames{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(StylesFactory.class);
+ private static final Logger logger = LogManager.getLogger(StylesFactory.class);
OdfOfficeStyles officeStyles;
OdfDefaultStyle defaultStyle;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.transform.JDOMSource;
*/
public class PdfOutputModule extends PublishOutputModuleBase {
- private static final Logger logger = Logger.getLogger(PdfOutputModule.class);
+ private static final Logger logger = LogManager.getLogger(PdfOutputModule.class);
public static String STYLESHEET_RESOURCE_DEFAULT = "/stylesheets/pdf/cdmToPdf.xsl";
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print.out.taxpub;
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
/**
* @author n.hoffmann
* @since Aug 4, 2010
- * @version 1.0
*/
public class TaxPubOutputModule extends PublishOutputModuleBase {
- private static final Logger logger = Logger
- .getLogger(TaxPubOutputModule.class);
- /* (non-Javadoc)
- * @see eu.etaxonomy.printpublisher.out.IPublishOutputModule#getOutputFileSuffix()
- */
- public String getOutputFileSuffix() {
+ private static final Logger logger = LogManager.getLogger(TaxPubOutputModule.class);
+
+ @Override
+ public String getOutputFileSuffix() {
return "taxpub.xml";
}
-
+
@Override
public void output(Document document, File exportFolder,
IProgressMonitor progressMonitor) {
super.output(document, exportFolder, progressMonitor);
-
+
progressMonitor.subTask("Not implemented yet");
}
}
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print.out.xml;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdom.Document;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
import eu.etaxonomy.cdm.print.out.PublishOutputModuleBase;
/**
- * Simple output module that writes the harvested xml data to disk without further processing.
- *
+ * Simple output module that writes the harvested xml data to disk without further processing.
+ *
* @author n.hoffmann
* @since Apr 8, 2010
- * @version 1.0
*/
public class XMLOutputModule extends PublishOutputModuleBase{
- private static final Logger logger = Logger
- .getLogger(XMLOutputModule.class);
- /* (non-Javadoc)
- * @see eu.etaxonomy.printpublisher.IPublishOutputModule#output(org.jdom.Document)
- */
- public void output(Document document, File exportFolder, IProgressMonitor progressMonitor) {
-
+ private static final Logger logger = LogManager.getLogger(XMLOutputModule.class);
+
+ @Override
+ public void output(Document document, File exportFolder, IProgressMonitor progressMonitor) {
+
super.output(document, exportFolder, progressMonitor);
-
+
try {
String filePath = getFilePath(exportFolder);
FileOutputStream outputStream = new FileOutputStream(filePath);
//XMLOutputter xmlOutputter = new XMLOutputter();
-
+
Format format = Format.getPrettyFormat();
format.setEncoding("UTF-8");
- XMLOutputter xmlOutputter = new XMLOutputter(format);
-
+ XMLOutputter xmlOutputter = new XMLOutputter(format);
+
xmlOutputter.output(document, outputStream);
logger.warn("XML output written to disk: " + filePath);
} catch (FileNotFoundException e) {
logger.error("A FileNotFoundException occured", e);
} catch (IOException e) {
-
+
}
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.printpublisher.out.IPublishOutputModule#getOutputFileSuffix()
- */
- public String getOutputFileSuffix() {
+ @Override
+ public String getOutputFileSuffix() {
return "xml";
}
}
import java.sql.SQLException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.jdom.Element;\r
import org.junit.Assert;\r
import org.springframework.core.io.ClassPathResource;\r
*/\r
public class PubTest {\r
\r
- private static final Logger logger = Logger.getLogger(PubTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PubTest.class);\r
\r
private static PublishConfigurator configurator;\r
\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.jdom.Element;
import org.junit.BeforeClass;
import org.junit.Ignore;
*/
//@Ignore // Implement this test in a more generic way
public class PublisherTest {
- private static final Logger logger = Logger.getLogger(PublisherTest.class);
+ private static final Logger logger = LogManager.getLogger(PublisherTest.class);
private static PublishConfigurator configurator;
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print;
import static org.junit.Assert.assertNotNull;
import javax.xml.transform.TransformerException;
-import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.junit.Ignore;
import org.junit.Test;
-import eu.etaxonomy.cdm.print.Transformator;
import eu.etaxonomy.cdm.print.out.odf.OdfOutputModule;
import eu.etaxonomy.cdm.print.out.odf.OdfOutputModuleTest;
/**
* @author n.hoffmann
* @since Apr 20, 2010
- * @version 1.0
*/
public class TransformatorTest {
- private static final Logger logger = Logger
- .getLogger(TransformatorTest.class);
- private Document input;
- /**
- * @throws java.lang.Exception
- */
+ private Document input;
+
@Before
public void setUp() throws Exception {
-
+
InputStream documentStream = OdfOutputModuleTest.class.getResourceAsStream("single_input.xml");
-
+
SAXBuilder builder = new SAXBuilder();
input = builder.build(documentStream);
-
}
/**
* Test method for {@link eu.etaxonomy.cdm.print.Transformator#Transformator(java.io.InputStream)}.
- * @throws XSLTransformException
- * @throws IOException
+ * @throws XSLTransformException
+ * @throws IOException
*/
@Test
@Ignore
/**
* Test method for {@link eu.etaxonomy.cdm.print.Transformator#transform(org.jdom.Document)}.
- * @throws JDOMException
- * @throws TransformerException
- * @throws IOException
+ * @throws JDOMException
+ * @throws TransformerException
+ * @throws IOException
*/
@Test
public void testTransform() throws IOException, TransformerException, JDOMException {
URL stylesheet = TransformatorTest.class.getResource(OdfOutputModule.STYLESHEET_RESOURCE_DEFAULT);
Transformator transformator = new Transformator(stylesheet);
-
+
Document output = transformator.transform(input);
-
+
XMLOutputter outputter = new XMLOutputter();
outputter.output(output, System.out);
-
+
assertNotNull("Output document should not be null", output);
}
}
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.print.out.odf;
import java.io.File;
import java.io.InputStream;
-import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.input.SAXBuilder;
import org.junit.Before;
import org.junit.Test;
-import eu.etaxonomy.cdm.print.out.odf.OdfOutputModule;
-
/**
* @author n.hoffmann
* @since Apr 23, 2010
- * @version 1.0
*/
public class OdfOutputModuleTest {
- private static final Logger logger = Logger
- .getLogger(OdfOutputModuleTest.class);
- private Document input;
-
- /**
- * @throws java.lang.Exception
- */
+ @SuppressWarnings("unused")
+ private Document input;
+
@Before
public void setUp() throws Exception {
-
+
InputStream documentStream = getClass().getResourceAsStream("single_input.xml");
-
+
SAXBuilder builder = new SAXBuilder();
input = builder.build(documentStream);
-
}
-
+
/**
* Test method for {@link eu.etaxonomy.cdm.print.out.odf.OdfOutputModule#output(org.jdom.Document, java.io.File)}.
*/
@Test
public void testOutputDocumentFile() {
OdfOutputModule outputModule = new OdfOutputModule();
-
+
File outputFolder = new File(".");
-
+
// outputModule.output(input, outputFolder);
-
-
}
}
*/
package eu.etaxonomy.cdm.remote.config;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.servlet.ServletContext;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.DependsOn;
*/
private static final boolean XML_VIEW_CACHING = true;
- public static final Logger logger = Logger.getLogger(CdmSpringMVCConfig.class);
+ public static final Logger logger = LogManager.getLogger(CdmSpringMVCConfig.class);
@Autowired
*/
package eu.etaxonomy.cdm.remote.config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.Profile;
@ImportResource(locations="classpath:/eu/etaxonomy/cdm/remoting-services.xml")
public class RemotingWebServices {
- public static final Logger logger = Logger.getLogger(RemotingWebServices.class);
+ public static final Logger logger = LogManager.getLogger(RemotingWebServices.class);
public RemotingWebServices() {
logger.info("========================================");
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class StaticSwaggerApiDoc {
- public static final Logger logger = Logger.getLogger(StaticSwaggerApiDoc.class);
+ public static final Logger logger = LogManager.getLogger(StaticSwaggerApiDoc.class);
public static final String SWAGGER_STATIC = "swagger-static";
public static final String JSON = ".json";
*/
package eu.etaxonomy.cdm.remote;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
/**
*/
public class ClassificationIT extends WebServiceTestBase {
- public static final Logger logger = Logger.getLogger(ClassificationIT.class);
+ public static final Logger logger = LogManager.getLogger(ClassificationIT.class);
@Test
public void checkInstanceIsOnline(){
import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
import eu.etaxonomy.cdm.remote.config.SwaggerGroupsConfig;
*/
public class SwaggerStaticIT extends WebServiceTestBase {
- public static final Logger logger = Logger.getLogger(SwaggerStaticIT.class);
+ public static final Logger logger = LogManager.getLogger(SwaggerStaticIT.class);
private String[] swaggerResourcesPaths = new String[]{"", "/configuration/ui", "/configuration/security" };
*/
package eu.etaxonomy.cdm.remote;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.springframework.web.client.RestTemplate;
-
/**
* @author a.kohlbecker
* @since Feb 22, 2016
- *
*/
public class WebServiceTestBase extends Assert {
- public static final Logger logger = Logger.getLogger(WebServiceTestBase.class);
-
+ public static final Logger logger = LogManager.getLogger(WebServiceTestBase.class);
private int port = 9180;
private String baseUri = "";
logger.debug("httpGetJson: " + uri.toString());
return template.getForObject(uri.toString(), String.class);
}
-
-}
+}
\ No newline at end of file
import javax.persistence.Entity;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
public class CdmSwaggerConfig {
- public static final Logger logger = Logger.getLogger(CdmSwaggerConfig.class);
+ public static final Logger logger = LogManager.getLogger(CdmSwaggerConfig.class);
Collection<Class<? extends Object>> allCdmTypes = null;
<groupId>de.digitalcollections.iiif</groupId>
<artifactId>iiif-apis</artifactId>
</dependency>
+
+ <!-- only until problems in LoggingConfigurator are solved -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
</dependencies>
</project>
import javax.sql.DataSource;
import org.apache.commons.io.FilenameUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.dialect.H2CorrectedDialect;
import org.hibernate.dialect.MySQL5MyISAMUtf8Dialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
@PropertySource(value="file:${user.home}/.cdmLibrary/cdmlib-remote.properties", ignoreResourceNotFound=true)
public class DataSourceConfigurer extends AbstractWebApplicationConfigurer {
- public static final Logger logger = Logger.getLogger(DataSourceConfigurer.class);
+ public static final Logger logger = LogManager.getLogger(DataSourceConfigurer.class);
protected static final String HIBERNATE_DIALECT = "hibernate.dialect";
protected static final String HIBERNATE_SEARCH_DEFAULT_INDEX_BASE = "hibernate.search.default.indexBase";
import java.io.File;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class EhCacheDiskStoreConfiguration {
- public static final Logger logger = Logger.getLogger(EhCacheDiskStoreConfiguration.class);
+ public static final Logger logger = LogManager.getLogger(EhCacheDiskStoreConfiguration.class);
@Autowired
private DataSourceProperties dataSourceProperties = null;
import java.util.List;\r
import java.util.Properties;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.InitializingBean;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.context.ApplicationContext;\r
*/\r
public abstract class AbstractWebApplicationConfigurer implements InitializingBean {\r
\r
- public static final Logger logger = Logger.getLogger(AbstractWebApplicationConfigurer.class);\r
+ public static final Logger logger = LogManager.getLogger(AbstractWebApplicationConfigurer.class);\r
\r
@Autowired\r
protected ConfigurableEnvironment env;\r
*/
package eu.etaxonomy.cdm.remote.config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
private static final String CLIENT_ID = "any-client";
- public static final Logger logger = Logger.getLogger(AuthorizationServerConfiguration.class);
+ public static final Logger logger = LogManager.getLogger(AuthorizationServerConfiguration.class);
@Autowired
private UserApprovalHandler userApprovalHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.PathVariable;
public abstract class AbstractIdentifiableController <T extends IdentifiableEntity, SERVICE extends IIdentifiableEntityService<T>>
extends BaseController<T,SERVICE> {
- private static final Logger logger = Logger.getLogger(AbstractIdentifiableController.class);
+ private static final Logger logger = LogManager.getLogger(AbstractIdentifiableController.class);
@InitBinder
@Override
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
public class AgentController extends AbstractIdentifiableController<AgentBase, IAgentService>\r
{\r
\r
- private static final Logger logger = Logger.getLogger(AgentController.class);\r
+ private static final Logger logger = LogManager.getLogger(AgentController.class);\r
\r
private static final List<String> TAXONNODEAGENTRELATIONS_INIT_STRATEGY = Arrays.asList(new String[]{\r
// NOTE: all other cases are covered in the TaxonNodeDaoHibernateImpl method\r
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.mapping.Map;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
public abstract class BaseController<T extends CdmBase, SERVICE extends IService<T>>
extends AbstractController<T, SERVICE> {
- private static final Logger logger = Logger.getLogger(BaseController.class);
+ private static final Logger logger = LogManager.getLogger(BaseController.class);
protected Class<T> baseClass;
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.web.bind.WebDataBinder;\r
import org.springframework.web.bind.annotation.InitBinder;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
*/\r
public abstract class BaseListController <T extends CdmBase, SERVICE extends IService<T>> extends AbstractListController<T, SERVICE> {\r
\r
- public static final Logger logger = Logger.getLogger(BaseListController.class);\r
+ public static final Logger logger = LogManager.getLogger(BaseListController.class);\r
\r
@InitBinder\r
public void initBinder(WebDataBinder binder) {\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
@RequestMapping(value = {"/classification/{uuid}"})
public class ClassificationController extends AbstractIdentifiableController<Classification,IClassificationService> {
- private static final Logger logger = Logger.getLogger(ClassificationController.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationController.class);
private ITermService termService;
private ITaxonNodeService taxonNodeService;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
public class ClassificationListController extends AbstractIdentifiableListController<Classification,IClassificationService> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger
- .getLogger(ClassificationListController.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationListController.class);
protected static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList(new String []{
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
@RequestMapping(value = {"/portal/classification/{uuid}"})\r
public class ClassificationPortalController extends ClassificationController {\r
\r
- public static final Logger logger = Logger.getLogger(ClassificationPortalController.class);\r
+ public static final Logger logger = LogManager.getLogger(ClassificationPortalController.class);\r
\r
private static final List<String> CLASSIFICATION_INIT_STRATEGY = Arrays.asList(new String[]{\r
"source.citation.authorship",\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
@RequestMapping(value="/portal/classification")\r
public class ClassificationPortalListController extends AbstractIdentifiableListController<Classification,IClassificationService> {\r
\r
- public static final Logger logger = Logger.getLogger(ClassificationPortalListController.class);\r
+ public static final Logger logger = LogManager.getLogger(ClassificationPortalListController.class);\r
\r
private static final List<String> CLASSIFICATION_INIT_STRATEGY = Arrays.asList(new String[]{\r
"source.citation.authorship"\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
@RequestMapping(value = {"/derivedUnitFacade/{uuid}"})\r
public class DerivedUnitFacadeController extends AbstractController<SpecimenOrObservationBase, IOccurrenceService>{\r
\r
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeController.class);\r
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeController.class);\r
\r
\r
private IOccurrenceService service;\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
@RequestMapping(value = {"/description/{uuid}", "/description/{uuid_list}"})
public class DescriptionController extends AbstractIdentifiableController<DescriptionBase, IDescriptionService> {
- private static final Logger logger = Logger.getLogger(DescriptionController.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionController.class);
@Autowired
private ITermTreeService termTreeService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
"modifyingText"
} );
- public static final Logger logger = Logger.getLogger(DescriptionElementController.class);
+ public static final Logger logger = LogManager.getLogger(DescriptionElementController.class);
@Autowired
private ITermService termService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
@RequestMapping(value = {"/descriptionElement"})
public class DescriptionElementListController {
- public static final Logger logger = Logger.getLogger(DescriptionElementListController.class);
+ public static final Logger logger = LogManager.getLogger(DescriptionElementListController.class);
@Autowired
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = {"/portal/descriptionElement"})
public class DescriptionElementListPortalController extends DescriptionElementListController {
- public static final Logger logger = Logger.getLogger(DescriptionElementListPortalController.class);
+ public static final Logger logger = LogManager.getLogger(DescriptionElementListPortalController.class);
protected static final List<String> DESCRIPTION_ELEMENT_INIT_STRATEGY = Arrays.asList(new String []{
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = {"/portal/description"})
public class DescriptionListPortalController extends DescriptionListController {
- public static final Logger logger = Logger.getLogger(DescriptionListPortalController.class);
+ public static final Logger logger = LogManager.getLogger(DescriptionListPortalController.class);
protected static final List<String> DESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
"$",
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
"/portal/description/{uuid_list}"})
public class DescriptionPortalController extends BaseController<DescriptionBase, IDescriptionService> {
- private static final Logger logger = Logger.getLogger(DescriptionPortalController.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionPortalController.class);
public static final EntityInitStrategy DESCRIPTION_INIT_STRATEGY = new EntityInitStrategy(Arrays.asList(new String [] {
"$",
import io.swagger.annotations.Api;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
public class EventBaseController extends BaseController<EventBase, IEventBaseService> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(EventBaseController.class);
+ private static final Logger logger = LogManager.getLogger(EventBaseController.class);
@Override
@Autowired
import javax.servlet.http.HttpServletResponse;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.kohlbecker\r
*/\r
public class HttpStatusMessage {\r
\r
- public static final Logger logger = Logger.getLogger(HttpStatusMessage.class);\r
+ public static final Logger logger = LogManager.getLogger(HttpStatusMessage.class);\r
\r
public final static HttpStatusMessage UUID_MISSING = new HttpStatusMessage(HttpServletResponse.SC_BAD_REQUEST, "missing uuid parameter");\r
public final static HttpStatusMessage UUID_INVALID = new HttpStatusMessage(HttpServletResponse.SC_BAD_REQUEST, "invalid uuid");\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
@RequestMapping(value = { "/manage" })
public class ManagementController {
- public static final Logger logger = Logger.getLogger(ManagementController.class);
+ public static final Logger logger = LogManager.getLogger(ManagementController.class);
// @Autowired
private DataSourceReloader datasoucrceLoader;
import javax.servlet.http.HttpServletResponse;\r
\r
import org.apache.http.HttpException;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
//import org.mortbay.log.Log;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
@RequestMapping(value = {"/media/{uuid}"})\r
public class MediaController extends AbstractIdentifiableController<Media, IMediaService>{\r
\r
- private static final Logger logger = Logger.getLogger(MediaController.class);\r
+ private static final Logger logger = LogManager.getLogger(MediaController.class);\r
\r
\r
@Autowired\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
-\r
package eu.etaxonomy.cdm.remote.controller;\r
\r
import java.io.IOException;\r
* @author a.kohlbecker\r
* @since 24.03.2009\r
*/\r
-\r
@Controller\r
@Api("name")\r
@RequestMapping(value = {"/name/{uuid}"})\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
@RequestMapping(value = {"/name"})\r
public class NameListController extends AbstractIdentifiableListController<TaxonName, INameService> {\r
\r
- private static final Logger logger = Logger.getLogger(NameListController.class);\r
+ private static final Logger logger = LogManager.getLogger(NameListController.class);\r
\r
@Autowired\r
private LocaleContext localeContext;\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@RequestMapping(value = {"/portal/name/{uuid}"})
public class NamePortalController extends BaseController<TaxonName, INameService> {
- private static final Logger logger = Logger.getLogger(NamePortalController.class);
+ private static final Logger logger = LogManager.getLogger(NamePortalController.class);
private static final EntityInitStrategy DEFAULT_INIT_STRATEGY = new EntityInitStrategy(
"$",
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@RequestMapping(value = {"/nomenclaturalStatus/{uuid}"})
public class NomenclaturalStatusController extends AbstractController<TaxonName, INameService> {
- private static final Logger logger = Logger.getLogger(NomenclaturalStatusController.class);
+ private static final Logger logger = LogManager.getLogger(NomenclaturalStatusController.class);
@Override
@Autowired
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.PathVariable;\r
@RequestMapping(value = {"/occurrence/{uuid}"})\r
public class OccurrenceController extends AbstractIdentifiableController<SpecimenOrObservationBase, IOccurrenceService>{\r
\r
- private static final Logger logger = Logger.getLogger(OccurrenceController.class);\r
+ private static final Logger logger = LogManager.getLogger(OccurrenceController.class);\r
\r
\r
protected static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList(new String []{\r
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
BY_NOMENCLATURAL_ORDER_ASC(OrderHint.NOMENCLATURAL_SORT_ORDER),
BY_NOMENCLATURAL_ORDER_DESC(OrderHint.NOMENCLATURAL_SORT_ORDER_DESC);
- public static final Logger logger = Logger.getLogger(OrderHintPreset.class);
+ public static final Logger logger = LogManager.getLogger(OrderHintPreset.class);
private final List<OrderHint> orderHints;
*/\r
package eu.etaxonomy.cdm.remote.controller;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
@Api("polytomousKey")\r
@RequestMapping(value = {"/polytomousKey/{uuid}"})\r
public class PolytomousKeyController extends AbstractIdentifiableController<PolytomousKey, IPolytomousKeyService> {\r
- public static final Logger logger = Logger.getLogger(PolytomousKeyController.class);\r
+ public static final Logger logger = LogManager.getLogger(PolytomousKeyController.class);\r
\r
@Override\r
@Autowired\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
@RequestMapping(value = {"/polytomousKey"})\r
public class PolytomousKeyListController extends AbstractIdentifiableListController<PolytomousKey, IPolytomousKeyService> {\r
\r
- public static final Logger logger = Logger.getLogger(PolytomousKeyListController.class);\r
+ public static final Logger logger = LogManager.getLogger(PolytomousKeyListController.class);\r
\r
private ITaxonService taxonService;\r
\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.PathVariable;\r
@Api(value="portal_polytomousKeyNode", description="Deprecated !")\r
@RequestMapping(value = {"/portal/polytomousKey/{uuid}"})\r
public class PolytomousKeyPortalController extends BaseController<PolytomousKey, IPolytomousKeyService> {\r
- public static final Logger logger = Logger.getLogger(PolytomousKeyPortalController.class);\r
+ public static final Logger logger = LogManager.getLogger(PolytomousKeyPortalController.class);\r
\r
@Override\r
@Autowired\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@RequestMapping(value = {"/registration"})
public class RegistrationController extends BaseController<Registration, IRegistrationService> {
- public static final Logger logger = Logger.getLogger(RegistrationController.class);
+ public static final Logger logger = LogManager.getLogger(RegistrationController.class);
public RegistrationController(){
setInitializationStrategy(Arrays.asList(new String[]{
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
private static final List<OrderHint> ORDER_BY_SUMMARY = Arrays.asList(new OrderHint("summary", SortOrder.ASCENDING));
- public static final Logger logger = Logger.getLogger(RegistrationDTOController.class);
+ public static final Logger logger = LogManager.getLogger(RegistrationDTOController.class);
public RegistrationDTOController(){
setInitializationStrategy(Arrays.asList(new String[]{
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = { "/statistics" })
public class StatisticsController {
- private static final Logger logger = Logger.getLogger(StatisticsController.class);
+ private static final Logger logger = LogManager.getLogger(StatisticsController.class);
@Autowired
private IClassificationService classificationService;
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
@RequestMapping(value = {"/taxon/{uuid}"})\r
public class TaxonController extends AbstractIdentifiableController<TaxonBase, ITaxonService>{\r
\r
- public static final Logger logger = Logger.getLogger(TaxonController.class);\r
+ public static final Logger logger = LogManager.getLogger(TaxonController.class);\r
\r
@Autowired\r
private IOccurrenceService occurrenceService;\r
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
public class TaxonGraphController {
- public static final Logger logger = Logger.getLogger(TaxonGraphController.class);
+ public static final Logger logger = LogManager.getLogger(TaxonGraphController.class);
@Autowired
private ITaxonGraphService service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@RequestMapping(value = {"/taxonNode/{uuid}"})
public class TaxonNodeController extends AbstractController<TaxonNode, ITaxonNodeService> {
- public static final Logger logger = Logger.getLogger(TaxonNodeController.class);
+ public static final Logger logger = LogManager.getLogger(TaxonNodeController.class);
@Override
@Autowired
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class TaxonNodePrintAppController extends AbstractController<TaxonNode, ITaxonNodeService> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonNodePrintAppController.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodePrintAppController.class);
private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.WebDataBinder;
@RequestMapping(value = {"/portal/taxon/{uuid}"})
public class TaxonPortalController extends TaxonController{
- public static final Logger logger = Logger.getLogger(TaxonPortalController.class);
+ public static final Logger logger = LogManager.getLogger(TaxonPortalController.class);
@Autowired
private INameService nameService;
*/
package eu.etaxonomy.cdm.remote.controller;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = {"/termNode/{uuid}"})
public class TermNodeController extends BaseController<TermNode, ITermNodeService> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermNodeController.class);
+ private static final Logger logger = LogManager.getLogger(TermNodeController.class);
@Override
@Autowired
package eu.etaxonomy.cdm.remote.controller;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = {"/termTree/{uuid}"})
public class TermTreeController extends AbstractIdentifiableController<TermTree, ITermTreeService> {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermTreeController.class);
+ private static final Logger logger = LogManager.getLogger(TermTreeController.class);
@Override
@Autowired
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = {"/portal/termTree/{uuid}"})
public class TermTreePortalController extends TermTreeController {
- public static final Logger logger = Logger.getLogger(TermTreePortalController.class);
+ public static final Logger logger = LogManager.getLogger(TermTreePortalController.class);
private static final List<String> TERMTREE_INIT_STRATEGY = Arrays.asList(
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FilenameUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
public class TypeDesignationController extends AbstractController<TaxonName, INameService> {
- private static final Logger logger = Logger.getLogger(TypeDesignationController.class);
+ private static final Logger logger = LogManager.getLogger(TypeDesignationController.class);
@Override
@Autowired
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.PathVariable;\r
@RequestMapping(value = {"/termVocabulary/{uuid}"})\r
public class VocabularyController extends AbstractIdentifiableController<TermVocabulary, IVocabularyService> {\r
\r
- public static final Logger logger = Logger.getLogger(VocabularyController.class);\r
+ public static final Logger logger = LogManager.getLogger(VocabularyController.class);\r
\r
\r
@Autowired\r
\r
import io.swagger.annotations.Api;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
@RequestMapping(value = {"/termVocabulary"})\r
public class VocabularyListController extends AbstractIdentifiableListController<TermVocabulary, IVocabularyService> {\r
\r
- public static final Logger logger = Logger.getLogger(VocabularyListController.class);\r
+ public static final Logger logger = LogManager.getLogger(VocabularyListController.class);\r
\r
/* (non-Javadoc)\r
* @see eu.etaxonomy.cdm.remote.controller.AbstractListController#setService(eu.etaxonomy.cdm.api.service.IService)\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.propertyeditors.UUIDEditor;
import org.springframework.context.ApplicationContext;
- private static final Logger logger = Logger.getLogger(ChecklistDemoController.class);
+ private static final Logger logger = LogManager.getLogger(ChecklistDemoController.class);
/**
* Helper method, which allows to convert strings directly into uuids.
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.beans.propertyeditors.UUIDEditor;\r
import org.springframework.context.ApplicationContext;\r
@Autowired\r
public ProgressMonitorController progressMonitorController;\r
\r
- private static final Logger logger = Logger.getLogger(CsvExportController.class);\r
+ private static final Logger logger = LogManager.getLogger(CsvExportController.class);\r
\r
\r
private static final List<String> TAXON_WITH_NODES_INIT_STRATEGY = Arrays.asList(new String []{\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ResourceLoaderAware;
private final static long DAY_IN_MILLIS = HOUR_IN_MILLIS * 24;
- private static final Logger logger = Logger.getLogger(DwcaExportController.class);
+ private static final Logger logger = LogManager.getLogger(DwcaExportController.class);
/**
* Helper method, which allows to convert strings directly into uuids.
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
public class NameCatalogueController extends AbstractController<TaxonName, INameService> implements ResourceLoaderAware {
- private static final Logger logger = Logger.getLogger(NameCatalogueController.class);
+ private static final Logger logger = LogManager.getLogger(NameCatalogueController.class);
private ResourceLoader resourceLoader;
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.context.ResourceLoaderAware;\r
import org.springframework.core.io.Resource;\r
public class OccurrenceCatalogueController extends AbstractController<SpecimenOrObservationBase, IOccurrenceService> implements ResourceLoaderAware{\r
\r
\r
- private static final Logger logger = Logger.getLogger(OccurrenceCatalogueController.class);\r
+ private static final Logger logger = LogManager.getLogger(OccurrenceCatalogueController.class);\r
\r
private ResourceLoader resourceLoader;\r
\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.annotation.PathVariable;\r
/**\r
* @author l.morris\r
* @since Feb 21, 2013\r
- *\r
*/\r
@Controller\r
@Api("polytomousKeyDTO")\r
@RequestMapping(value = {"/dto/polytomousKey/"})\r
public class PolytomousKeyNodeDtoController extends AbstractController<PolytomousKey, IPolytomousKeyService> {\r
\r
- public static final Logger logger = Logger\r
- .getLogger(PolytomousKeyNodeDtoController.class);\r
+ public static final Logger logger = LogManager.getLogger(PolytomousKeyNodeDtoController.class);\r
\r
private static final List<String> KEY_INIT_STRATEGY = Arrays.asList(new String[]{\r
"root.children"\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.apache.commons.lang.ObjectUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
import org.springframework.web.bind.annotation.RequestMethod;\r
import org.springframework.web.bind.annotation.RequestParam;\r
@RequestMapping(value = { "/ext/bhl-e/" })\r
public class ExternalBhleController {\r
\r
- public static final Logger logger = Logger.getLogger(ExternalBhleController.class);\r
+ public static final Logger logger = LogManager.getLogger(ExternalBhleController.class);\r
\r
public static String baseUrl = "http://gso.gbv.de/sru/DB=2.1/";\r
\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
@RequestMapping(value = { "ext/edit/mapServiceParameters/" })\r
public class ExternalGeoController extends BaseController<TaxonBase, ITaxonService> {\r
\r
- public static final Logger logger = Logger.getLogger(ExternalGeoController.class);\r
+ public static final Logger logger = LogManager.getLogger(ExternalGeoController.class);\r
\r
@Autowired\r
private IEditGeoService geoservice;\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@RequestMapping(value = { "kml" })
public class KmlController extends BaseController<TaxonBase, ITaxonService> {
- public static final Logger logger = Logger.getLogger(KmlController.class);
+ public static final Logger logger = LogManager.getLogger(KmlController.class);
@Autowired
private IEditGeoService geoservice;
import java.util.stream.Collectors;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import de.digitalcollections.iiif.model.ImageContent;
import de.digitalcollections.iiif.model.MetadataEntry;
*/
public class ManifestComposer {
- public static final Logger logger = Logger.getLogger(ManifestComposer.class);
+ public static final Logger logger = LogManager.getLogger(ManifestComposer.class);
private IMediaToolbox mediaTools;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.CrossOrigin;
private static final String HTTP_IIIF_CYBERTAXONOMY_ORG = "http://iiif.cybertaxonomy.org/";
- public static final Logger logger = Logger.getLogger(ManifestController.class);
+ public static final Logger logger = LogManager.getLogger(ManifestController.class);
@InitBinder
public void initBinder(WebDataBinder binder) {
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;\r
\r
import eu.etaxonomy.cdm.database.NamedContextHolder;\r
*/\r
@Deprecated\r
public class DatasourceContextHandlerInterceptor extends HandlerInterceptorAdapter {\r
- private static final Logger logger = Logger.getLogger(DatasourceContextHandlerInterceptor.class);\r
+ private static final Logger logger = LogManager.getLogger(DatasourceContextHandlerInterceptor.class);\r
\r
private final static Pattern basepathPattern = Pattern.compile("^/([^/]+)/.*");\r
\r
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component // not used for component scan, see eu.etaxonomy.cdm.remote.config.CdmRemoteConfiguration
public class MediaToolbox implements IMediaToolbox {
- private static final Logger logger = Logger.getLogger(MediaToolbox.class);
+ private static final Logger logger = LogManager.getLogger(MediaToolbox.class);
private List<MediaUriTransformation> transformations = null;
import javax.servlet.ServletContext;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.web.context.ServletContextAware;
import com.github.dozermapper.core.CustomConverter;
private ServletContext servletContext;
- public static final Logger logger = Logger.getLogger(IdentifierConverter.class);
+ public static final Logger logger = LogManager.getLogger(IdentifierConverter.class);
@Override
public Object convert(Object destination, Object source, Class<?> destClass, Class<?> sourceClass) {
import java.util.Set;\r
\r
import org.apache.commons.lang.StringUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;\r
import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
private OccurrenceSearchRequest request;\r
private final List<OccurrenceSearchResponse> response;\r
\r
- public static final Logger logger = Logger.getLogger(BaseListController.class);\r
+ public static final Logger logger = LogManager.getLogger(BaseListController.class);\r
\r
public OccurrenceSearch() {\r
this.response = new ArrayList<OccurrenceSearchResponse>();\r
\r
import java.beans.PropertyEditorSupport;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* @author a.kohlbecker\r
*/\r
public class CdmTypePropertyEditor extends PropertyEditorSupport {\r
\r
- public static final Logger logger = Logger.getLogger(CdmTypePropertyEditor.class);\r
+ public static final Logger logger = LogManager.getLogger(CdmTypePropertyEditor.class);\r
\r
@Override\r
public void setAsText(String text) {\r
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
public class CdmExceptionResolver extends SimpleMappingExceptionResolver {
- public static final Logger logger = Logger.getLogger(CdmExceptionResolver.class);
+ public static final Logger logger = LogManager.getLogger(CdmExceptionResolver.class);
import java.util.List;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.FactoryBean;\r
\r
import eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor;\r
*/\r
public class JsonConfigFactoryBean implements FactoryBean<JsonConfig> {\r
\r
- public static final Logger logger = Logger.getLogger(JsonConfigFactoryBean.class);\r
+ public static final Logger logger = LogManager.getLogger(JsonConfigFactoryBean.class);\r
\r
private JsonConfig jsonConfig = null;\r
\r
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author a.kohlbecker
*/
public class JsonpUtil {
- public static final Logger logger = Logger.getLogger(JsonpUtil.class);
+ public static final Logger logger = LogManager.getLogger(JsonpUtil.class);
/**
* @param request
import java.util.HashSet;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import net.sf.json.CycleSetAcess;\r
@Deprecated\r
public class CdmBeanProcessingRegistry extends CycleSetAcess {\r
\r
- private static final Logger logger = Logger.getLogger(CdmBeanProcessingRegistry.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmBeanProcessingRegistry.class);\r
\r
protected static ThreadLocal<Set<CdmBase>> processedBeans = new ThreadLocal<Set<CdmBase>>(){\r
@Override\r
import java.util.Set;\r
\r
import org.apache.commons.beanutils.PropertyUtils;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Hibernate;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
*/\r
public abstract class AbstractBeanProcessor<T extends Object> implements JsonBeanProcessor{\r
\r
- public static final Logger logger = Logger.getLogger(AbstractBeanProcessor.class);\r
+ public static final Logger logger = LogManager.getLogger(AbstractBeanProcessor.class);\r
\r
private Set<String> excludes = new HashSet<>();\r
\r
*/
package eu.etaxonomy.cdm.remote.json.processor.bean;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class CdmLinkSourceBeanProcessor implements JsonBeanProcessor {
- public static final Logger logger = Logger.getLogger(CdmLinkSourceBeanProcessor.class);
+ public static final Logger logger = LogManager.getLogger(CdmLinkSourceBeanProcessor.class);
@Override
public JSONObject processBean(Object bean, JsonConfig jsonConfig) {
*/\r
package eu.etaxonomy.cdm.remote.json.processor.bean;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
import net.sf.json.CycleSetAcess;\r
*/\r
public class HibernateProxyBeanProcessor extends CycleSetAcess implements JsonBeanProcessor {\r
\r
- public static final Logger logger = Logger.getLogger(HibernateProxyBeanProcessor.class);\r
+ public static final Logger logger = LogManager.getLogger(HibernateProxyBeanProcessor.class);\r
\r
@Override\r
public JSONObject processBean(Object bean, JsonConfig jsonConfig) {\r
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Hibernate;\r
\r
import eu.etaxonomy.cdm.api.service.l10n.LocaleContext;\r
*/\r
public class MediaBeanProcessor extends AbstractCdmBeanProcessor<Media> {\r
\r
- public static final Logger logger = Logger.getLogger(MediaBeanProcessor.class);\r
+ public static final Logger logger = LogManager.getLogger(MediaBeanProcessor.class);\r
\r
private static final List<String> IGNORE_LIST = Arrays.asList(new String[] {\r
"title",\r
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.Representation;
*/
public class RepresentationBeanProcessor extends AbstractCdmBeanProcessor<Representation> {
- public static final Logger logger = Logger.getLogger(RepresentationBeanProcessor.class);
+ public static final Logger logger = LogManager.getLogger(RepresentationBeanProcessor.class);
private static final List<String> IGNORE_LIST = Arrays.asList(new String[] {
// "representations",
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import net.sf.json.JSONObject;
*/
public class TaxonBaseBeanProcessor extends AbstractCdmBeanProcessor<TaxonBase> {
- public static final Logger logger = Logger.getLogger(TaxonBaseBeanProcessor.class);
+ public static final Logger logger = LogManager.getLogger(TaxonBaseBeanProcessor.class);
private boolean skipTaggedTitle = false;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.name.TaxonName;
import net.sf.json.JSONObject;
*/
public class TaxonNameBeanProcessor extends AbstractCdmBeanProcessor<TaxonName> {
- public static final Logger logger = Logger.getLogger(TaxonNameBeanProcessor.class);
+ public static final Logger logger = LogManager.getLogger(TaxonNameBeanProcessor.class);
private boolean skipTaggedName = false;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import eu.etaxonomy.cdm.api.service.l10n.LocaleContext;
*/
public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor<TaxonNode> implements IMultilanguageTextBeanProcessor {
- private static final Logger logger = Logger.getLogger(TaxonNodeBeanProcessor.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeBeanProcessor.class);
private static final List<String> IGNORE_LIST = Arrays.asList("text");
import java.util.Arrays;\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Hibernate;\r
\r
import eu.etaxonomy.cdm.api.service.l10n.TermRepresentation_L10n;\r
*/\r
public class TermBaseBeanProcessor extends AbstractCdmBeanProcessor<TermBase> {\r
\r
- public static final Logger logger = Logger.getLogger(TermBaseBeanProcessor.class);\r
+ public static final Logger logger = LogManager.getLogger(TermBaseBeanProcessor.class);\r
\r
private static final List<String> IGNORE_LIST = Arrays.asList(new String[] {\r
"representations",\r
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.proxy.HibernateProxy;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
*/
public class CdmProxyBeanProcessorMatcher extends JsonBeanProcessorMatcher {
- public static final Logger logger = Logger.getLogger(CdmProxyBeanProcessorMatcher.class);
+ public static final Logger logger = LogManager.getLogger(CdmProxyBeanProcessorMatcher.class);
/* (non-Javadoc)
* @see net.sf.json.processors.JsonBeanProcessorMatcher#getMatch(java.lang.Class, java.util.Set)
\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.proxy.HibernateProxy;\r
\r
import net.sf.json.processors.JsonBeanProcessorMatcher;\r
public class HibernateProxyBeanProcessorMatcher extends\r
JsonBeanProcessorMatcher {\r
\r
- public static final Logger logger = Logger.getLogger(HibernateProxyBeanProcessorMatcher.class);\r
+ public static final Logger logger = LogManager.getLogger(HibernateProxyBeanProcessorMatcher.class);\r
\r
/* (non-Javadoc)\r
* @see net.sf.json.processors.JsonBeanProcessorMatcher#getMatch(java.lang.Class, java.util.Set)\r
import net.sf.json.JsonConfig;
import net.sf.json.processors.JsonValueProcessor;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
* @version 1.0
*/
public class CalendarJSONValueProcessor implements JsonValueProcessor {
- private static Logger logger = Logger.getLogger(DateTimeJSONValueProcessor.class);
+ private static Logger logger = LogManager.getLogger(DateTimeJSONValueProcessor.class);
private static SimpleDateFormat iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz");
\r
package eu.etaxonomy.cdm.remote.json.processor.value;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import net.sf.json.JsonConfig;\r
import net.sf.json.processors.JsonValueProcessor;\r
\r
public class ClassJSONValueProcessor implements JsonValueProcessor {\r
\r
- private static final Logger logger = Logger.getLogger(ClassJSONValueProcessor.class);\r
+ private static final Logger logger = LogManager.getLogger(ClassJSONValueProcessor.class);\r
\r
@Override\r
public Object processArrayValue(Object obj, JsonConfig jsonConfig) {\r
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.remote.json.processor.value;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
/**
* @author n.hoffmann
* @since 24.07.2008
- * @version 1.0
*/
public class DateTimeJSONValueProcessor implements JsonValueProcessor {
- private static Logger logger = Logger
- .getLogger(DateTimeJSONValueProcessor.class);
+
+ @SuppressWarnings("unused")
+ private static Logger logger = LogManager.getLogger(DateTimeJSONValueProcessor.class);
private static DateTimeFormatter iso8601Format = ISODateTimeFormat.dateTime();
- /* (non-Javadoc)
- * @see net.sf.json.processors.JsonValueProcessor#processArrayValue(java.lang.Object, net.sf.json.JsonConfig)
- */
@Override
public Object processArrayValue(Object object, JsonConfig jsonConfig) {
DateTime dateTime = (DateTime) object;
return formatDateTime(object);
}
- /* (non-Javadoc)
- * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)
- */
@Override
public Object processObjectValue(String key, Object object,
JsonConfig jsonConfig) {
return formatDateTime(object);
}
- /**
- * @param object
- * @return
- */
public Object formatDateTime(Object object) {
if(object != null){
DateTime dateTime = (DateTime) object;
return null;
}
}
-}
+}
\ No newline at end of file
import net.sf.json.JsonConfig;\r
import net.sf.json.processors.JsonValueProcessor;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
import eu.etaxonomy.cdm.remote.json.processor.matcher.HibernateJSONValueProcessorMatcher;\r
*/\r
public class HibernateJSONValueProcessor implements JsonValueProcessor {\r
\r
- public static final Logger logger = Logger.getLogger(HibernateJSONValueProcessor.class);\r
+ public static final Logger logger = LogManager.getLogger(HibernateJSONValueProcessor.class);\r
\r
// public Object processArrayValue(Object object, JsonConfig jsonConfig) {\r
// if(Hibernate.isInitialized(object)) {\r
*/
package eu.etaxonomy.cdm.remote.json.processor.value;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.l10n.KeyTerm_L10n;
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus;
*/
public class KeyTermValueProcessor implements JsonValueProcessor {
- public static final Logger logger = Logger.getLogger(KeyTermValueProcessor.class);
+ public static final Logger logger = LogManager.getLogger(KeyTermValueProcessor.class);
@Override
public Object processArrayValue(Object value, JsonConfig jsonConfig) {
import net.sf.json.JsonConfig;
import net.sf.json.processors.JsonValueProcessor;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.Partial;
import org.joda.time.format.ISODateTimeFormat;
* @version 1.0
*/
public class PartialJSONValueProcessor implements JsonValueProcessor {
- private static Logger logger = Logger.getLogger(PartialJSONValueProcessor.class);
+ private static Logger logger = LogManager.getLogger(PartialJSONValueProcessor.class);
/* (non-Javadoc)
*/\r
package eu.etaxonomy.cdm.remote.json.processor.value;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.common.URI;\r
import net.sf.json.JsonConfig;\r
\r
public class URIJSONValueProcessor implements JsonValueProcessor {\r
\r
- private static final Logger logger = Logger.getLogger(URIJSONValueProcessor.class);\r
+ private static final Logger logger = LogManager.getLogger(URIJSONValueProcessor.class);\r
\r
@Override\r
public Object processArrayValue(Object obj, JsonConfig jsonConfig) {\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import net.sf.json.JsonConfig;\r
import net.sf.json.processors.JsonValueProcessor;\r
\r
public class UUIDJSONValueProcessor implements JsonValueProcessor {\r
\r
- private static final Logger logger = Logger.getLogger(UUIDJSONValueProcessor.class);\r
+ private static final Logger logger = LogManager.getLogger(UUIDJSONValueProcessor.class);\r
\r
@Override\r
public Object processArrayValue(Object obj, JsonConfig jsonConfig) {\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import net.sf.json.util.PropertyFilter;\r
public class CardinalityPropertyFilter implements PropertyFilter {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CardinalityPropertyFilter.class);\r
+ private static final Logger logger = LogManager.getLogger(CardinalityPropertyFilter.class);\r
\r
boolean includeToOneRelations = true;\r
\r
\r
import net.sf.json.util.PropertyFilter;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.Hibernate;\r
\r
public class InitializedHibernatePropertyFilter implements PropertyFilter {\r
\r
- private static final Logger logger = Logger.getLogger(InitializedHibernatePropertyFilter.class);\r
+ private static final Logger logger = LogManager.getLogger(InitializedHibernatePropertyFilter.class);\r
\r
/* (non-Javadoc)\r
* @see net.sf.json.util.PropertyFilter#apply(java.lang.Object, java.lang.String, java.lang.Object)\r
import java.util.HashSet;
import java.util.Set;
-import org.jboss.logging.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.api.util.UserHelper;
@Component
public class RegistrableEntityFilter {
- private static Logger logger = Logger.getLogger(RegistrableEntityFilter.class);
+ private static Logger logger = LogManager.getLogger(RegistrableEntityFilter.class);
protected UserHelper userHelper;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.json.CDL;
import org.json.JSONArray;
import org.json.JSONObject;
private File file;
- Logger logger = Logger.getLogger(CsvFileDownloadView.class);
+ Logger logger = LogManager.getLogger(CsvFileDownloadView.class);
/**
*
\r
import org.apache.commons.beanutils.BeanUtilsBean;\r
import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.web.servlet.View;\r
\r
import eu.etaxonomy.cdm.opt.config.DataSourceProperties;\r
BeanUtilsBean.setInstance(bub);\r
}\r
\r
- public static final Logger logger = Logger.getLogger(JsonView.class);\r
+ public static final Logger logger = LogManager.getLogger(JsonView.class);\r
\r
private JsonConfig jsonConfig;\r
\r
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.web.util.NestedServletException;
/**
*
* @author a.kohlbecker
* @since Jan 17, 2020
- *
*/
public class DateHeaderFilter implements Filter {
+ private static final Logger logger = LogManager.getLogger(DateHeaderFilter.class);
@Override
public void init(FilterConfig filterConfig) throws ServletException {
httpServletResponse.setHeader("Date", dateTime.format(DateTimeFormatter.RFC_1123_DATE_TIME));
} catch ( NullPointerException e) {
// see above and #9185
- Logger.getLogger(this.getClass()).info("Can not add data header: " + e.getMessage());
+ logger.info("Can not add data header: " + e.getMessage());
} catch (NestedServletException e) {
// see above and #9185
if(e.getCause() != null && e.getCause() instanceof NullPointerException) {
- Logger.getLogger(this.getClass()).info("Can not add data header: " + e.getCause());
+ logger.info("Can not add data header: " + e.getCause());
} else {
// higher level in this case as these are unexpected
- Logger.getLogger(this.getClass()).warn("Can not add data header.", e);
+ logger.warn("Can not add data header.", e);
}
} catch (Exception e) {
// higher level in this case as these are unexpected
- Logger.getLogger(this.getClass()).warn("Can not add data header.", e);
+ logger.warn("Can not add data header.", e);
}
}
public void destroy() {
// Nothing to do
}
-
-}
+}
\ No newline at end of file
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.LazyInitializationException;
@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/applicationContext-test.xml")
public class AssemblerTest extends UnitilsJUnit4 {
- public static final Logger logger = Logger.getLogger(AssemblerTest.class);
+ public static final Logger logger = LogManager.getLogger(AssemblerTest.class);
@SpringBeanByType
private Mapper mapper;
*/
package eu.etaxonomy.cdm.remote.io.application;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
public class CdmRemoteApplicationController extends CdmIoApplicationController {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmRemoteApplicationController.class);
+ private static final Logger logger = LogManager.getLogger(CdmRemoteApplicationController.class);
public static final String DEFAULT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/applicationRemoteContext.xml";
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.joda.time.DateTime;\r
import org.junit.Before;\r
import org.junit.Ignore;\r
@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/applicationContext-test.xml")\r
public class JsonToCsvViewTest extends UnitilsJUnit4 {\r
\r
- public static final Logger logger = Logger.getLogger(JsonToCsvViewTest.class);\r
+ public static final Logger logger = LogManager.getLogger(JsonToCsvViewTest.class);\r
\r
@SpringBeanByName\r
private Marshaller marshaller;\r
import java.util.Map;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.custommonkey.xmlunit.XMLUnit;\r
import org.hibernate.envers.RevisionType;\r
import org.joda.time.DateTime;\r
@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/applicationContext-test.xml")\r
public class OaiPmhViewTest extends UnitilsJUnit4 {\r
\r
- public static final Logger logger = Logger.getLogger(OaiPmhViewTest.class);\r
+ public static final Logger logger = LogManager.getLogger(OaiPmhViewTest.class);\r
\r
@SpringBeanByName\r
private Marshaller marshaller;\r
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.web.servlet.ModelAndView;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
public class TestScriptRemote {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TestScriptRemote.class);
+ private static final Logger logger = LogManager.getLogger(TestScriptRemote.class);
private void testNewConfigControler(){
import java.util.Properties;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.SessionFactory;\r
import org.springframework.beans.MutablePropertyValues;\r
import org.springframework.beans.factory.config.BeanDefinition;\r
*/\r
public class CdmApplicationController implements ICdmRepository {\r
\r
- private static final Logger logger = Logger.getLogger(CdmApplicationController.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmApplicationController.class);\r
\r
public static final String DEFAULT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultApplicationContext.xml";\r
\r
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@Component
public class CdmRepository implements ICdmRepository, ApplicationContextAware {
- private static final Logger logger = Logger.getLogger(CdmRepository.class);
+ private static final Logger logger = LogManager.getLogger(CdmRepository.class);
protected ApplicationContext applicationContext;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.ContextStartedEvent;
//@RunAs("ROLE_ADMIN") // seems to be broken in spring see: https://jira.springsource.org/browse/SEC-1671
public class FirstDataInserter extends AbstractDataInserter {
- public static final Logger logger = Logger.getLogger(FirstDataInserter.class);
+ public static final Logger logger = LogManager.getLogger(FirstDataInserter.class);
private static final EnumSet<CRUD> CREATE_READ = EnumSet.of(CRUD.CREATE, CRUD.READ);
private static final EnumSet<CRUD> UPDATE_DELETE = EnumSet.of(CRUD.UPDATE, CRUD.DELETE);
\r
import java.util.concurrent.CancellationException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.BeansException;\r
import org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver;\r
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;\r
*/\r
public class MonitoredGenericApplicationContext extends GenericApplicationContext{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmApplicationController.class);\r
+ private static final Logger logger = LogManager.getLogger(CdmApplicationController.class);\r
\r
final int countInvokeBeanFactoryPostProcessors = 10;\r
final int countFinishBeanFactoryInitialization = 90;\r
import java.util.Set;\r
import java.util.concurrent.CancellationException;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.BeansException;\r
import org.springframework.beans.factory.support.DefaultListableBeanFactory;\r
import org.springframework.beans.factory.support.RootBeanDefinition;\r
*/\r
public class MonitoredListableBeanFactory extends DefaultListableBeanFactory {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MonitoredListableBeanFactory.class);\r
+ private static final Logger logger = LogManager.getLogger(MonitoredListableBeanFactory.class);\r
\r
private boolean isInitializingBeans = false;\r
private IProgressMonitor currentMonitor;\r
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.security.access.intercept.RunAsUserToken;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.authentication.AuthenticationProvider;
*/
public class RunAsAuthenticator {
- public static final Logger logger = Logger.getLogger(RunAsAuthenticator.class);
+ public static final Logger logger = LogManager.getLogger(RunAsAuthenticator.class);
/**
* must match the key in eu/etaxonomy/cdm/services_security.xml
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import eu.etaxonomy.cdm.model.ICdmUuidCacher;
*/
public abstract class CdmCacherBase implements ICdmUuidCacher {
- public static final Logger logger = Logger.getLogger(CdmCacherBase.class);
+ public static final Logger logger = LogManager.getLogger(CdmCacherBase.class);
@Autowired
public CacheManager cacheManager;
*/
package eu.etaxonomy.cdm.api.config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
// @EnableCaching // for future use
public class EhCacheConfiguration implements DisposableBean {
- public static final Logger logger = Logger.getLogger(EhCacheConfiguration.class);
+ public static final Logger logger = LogManager.getLogger(EhCacheConfiguration.class);
@Autowired(required = false)
public DiskStoreConfiguration diskStoreConfiguration = null;
import java.util.List;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@AppConfigurationProperties
public class SendEmailConfigurer {
- private static final Logger logger = Logger.getLogger(SendEmailConfigurer.class);
+ private static final Logger logger = LogManager.getLogger(SendEmailConfigurer.class);
@Autowired
Environment env;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.FlushMode;
import org.hibernate.LockMode;
import org.hibernate.Session;
*/
public class ConversationHolder {
- private static final Logger logger = Logger.getLogger(ConversationHolder.class);
+ private static final Logger logger = LogManager.getLogger(ConversationHolder.class);
@Autowired
private SessionFactory sessionFactory;
import javax.persistence.Transient;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.common.URI;
private static final String METER = "m";
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitFacade.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacade.class);
private static final String notSupportMessage = "A specimen facade not supported exception has occurred at a place where this should not have happened. The developer should implement not support check properly during class initialization ";
import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.agent.Institution;
private static final long serialVersionUID = 1578628591216605619L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeCacheStrategy.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeCacheStrategy.class);
private static final UUID uuid = UUID.fromString("df4672c1-ce5c-4724-af6d-91e2b326d4a4");
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
\r
*/\r
public class DerivedUnitFacadeConfigurator {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeConfigurator.class);\r
\r
\r
public static DerivedUnitFacadeConfigurator NewInstance(){\r
*/\r
package eu.etaxonomy.cdm.api.facade;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* This exception should be thrown if a derived unit facade can not be created or \r
public class DerivedUnitFacadeNotSupportedException extends Exception {\r
private static final long serialVersionUID = -2593445506656913492L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeNotSupportedException.class);\r
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeNotSupportedException.class);\r
\r
\r
/**\r
*/\r
package eu.etaxonomy.cdm.api.facade;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* This exception should be thrown if a derived unit facade does not support a certain\r
public class MethodNotSupportedByDerivedUnitTypeException extends Exception {\r
private static final long serialVersionUID = -1135345372784107810L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(MethodNotSupportedByDerivedUnitTypeException.class);\r
+ private static final Logger logger = LogManager.getLogger(MethodNotSupportedByDerivedUnitTypeException.class);\r
\r
\r
/**\r
import java.util.Arrays;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.remoting.support.RemoteInvocation;
import org.springframework.remoting.support.RemoteInvocationExecutor;
import org.springframework.util.Assert;
*/
public class DebuggingRemoteInvocationExecutor implements RemoteInvocationExecutor {
- private static final Logger logger = Logger.getLogger(DebuggingRemoteInvocationExecutor.class);
+ private static final Logger logger = LogManager.getLogger(DebuggingRemoteInvocationExecutor.class);
@Override
public Object invoke(RemoteInvocation invocation, Object targetObject)
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
/**
* @author a.kohlbecker
public abstract class AbstractRequestTokenStore<T extends AbstractRequestToken, X extends Object> implements IAbstractRequestTokenStore<T, X> {
public static final int TOKEN_LENGTH = 50;
- protected static Logger logger = Logger.getLogger(AbstractRequestTokenStore.class);
+ protected static Logger logger = LogManager.getLogger(AbstractRequestTokenStore.class);
protected Map<String, T> tokenList = new HashMap<>();
private Integer tokenLifetimeMinutes = null;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
extends IdentifiableServiceBase<AgentBase,IAgentDao>
implements IAgentService {
- private static final Logger logger = Logger.getLogger(AgentServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(AgentServiceImpl.class);
@Autowired
private ICdmGenericDao genericDao;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
extends IdentifiableServiceBase<Classification, IClassificationDao>
implements IClassificationService {
- private static final Logger logger = Logger.getLogger(ClassificationServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationServiceImpl.class);
@Autowired
private ITaxonNodeDao taxonNodeDao;
\r
import java.util.List;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Service;\r
import org.springframework.transaction.annotation.Transactional;\r
implements ICollectionService {\r
\r
@SuppressWarnings("unused")\r
- static private final Logger logger = Logger.getLogger(CollectionServiceImpl.class);\r
+ static private final Logger logger = LogManager.getLogger(CollectionServiceImpl.class);\r
\r
@Autowired\r
@Override\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Service;\r
import org.springframework.transaction.annotation.Transactional;\r
implements ICommonService {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CommonServiceImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(CommonServiceImpl.class);\r
\r
@Autowired\r
private IOriginalSourceDao originalSourceDao;\r
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.SessionFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
@Service
@Transactional(readOnly = true)
public class DatabaseServiceHibernateImpl implements IDatabaseService, ApplicationContextAware {
- private static final Logger logger = Logger.getLogger(DatabaseServiceHibernateImpl.class);
+ private static final Logger logger = LogManager.getLogger(DatabaseServiceHibernateImpl.class);
private static final String TMP_DATASOURCE = "tmp";
import java.util.HashSet;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
\r
\r
private static final long serialVersionUID = 8856465763413085548L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DeleteResult.class);\r
+ private static final Logger logger = LogManager.getLogger(DeleteResult.class);\r
\r
private final Set<CdmBase> relatedObjects = new HashSet<>();\r
private Set<CdmBase> deletedObjects = new HashSet<>();\r
*/
package eu.etaxonomy.cdm.api.service;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
extends AnnotatableServiceBase<DescriptionElementBase,IDescriptionElementDao>
implements IDescriptionElementService {
- private static final Logger logger = Logger.getLogger(DescriptionElementServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionElementServiceImpl.class);
@Override
@Autowired
import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
extends IdentifiableServiceBase<DescriptionBase,IDescriptionDao>
implements IDescriptionService {
- private static final Logger logger = Logger.getLogger(DescriptionServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionServiceImpl.class);
protected IDescriptionElementDao descriptionElementDao;
protected ITermTreeDao featureTreeDao;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
extends IdentifiableServiceBase<DescriptiveDataSet, IDescriptiveDataSetDao>
implements IDescriptiveDataSetService {
- private static Logger logger = Logger.getLogger(DescriptiveDataSetService.class);
+ private static Logger logger = LogManager.getLogger(DescriptiveDataSetService.class);
@Autowired
private IOccurrenceService occurrenceService;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.criterion.Criterion;
import org.springframework.transaction.annotation.Transactional;
implements IIdentifiableEntityService<T>{
protected static final int UPDATE_TITLE_CACHE_DEFAULT_STEP_SIZE = 1000;
- protected static final Logger logger = Logger.getLogger(IdentifiableServiceBase.class);
+ protected static final Logger logger = LogManager.getLogger(IdentifiableServiceBase.class);
@Override
@Transactional(readOnly = true)
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
public class LocationServiceImpl extends ServiceBase<DefinedTermBase,IDefinedTermDao> implements ILocationService {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(LocationServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(LocationServiceImpl.class);
@Autowired
protected ITermVocabularyDao vocabularyDao;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.Term;
import org.apache.lucene.sandbox.queries.FuzzyLikeThisQuery;
import org.apache.lucene.search.BooleanClause.Occur;
extends IdentifiableServiceBase<TaxonName,ITaxonNameDao>
implements INameService {
- static private final Logger logger = Logger.getLogger(NameServiceImpl.class);
+ static private final Logger logger = LogManager.getLogger(NameServiceImpl.class);
@Autowired
private IOccurrenceService occurrenceService;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.format.description.DefaultCategoricalDescriptionBuilder;
public class NaturalLanguageGenerator implements INaturalLanguageGenerator {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NaturalLanguageGenerator.class);
+ private static final Logger logger = LogManager.getLogger(NaturalLanguageGenerator.class);
private String firstSeparator = ",";
private String secondSeparator = ".";
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery.Builder;
extends IdentifiableServiceBase<SpecimenOrObservationBase, IOccurrenceDao>
implements IOccurrenceService {
- static private final Logger logger = Logger.getLogger(OccurrenceServiceImpl.class);
+ static private final Logger logger = LogManager.getLogger(OccurrenceServiceImpl.class);
@Autowired
private IDescriptionService descriptionService;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
public class PreferenceServiceImpl implements IPreferenceService {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PreferenceServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(PreferenceServiceImpl.class);
@Autowired
private IPreferenceDao dao;
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Service;\r
import org.springframework.transaction.annotation.Transactional;\r
@Transactional(readOnly = true)\r
public class ReferenceServiceImpl extends IdentifiableServiceBase<Reference,IReferenceDao> implements IReferenceService {\r
\r
- static Logger logger = Logger.getLogger(ReferenceServiceImpl.class);\r
+ static Logger logger = LogManager.getLogger(ReferenceServiceImpl.class);\r
\r
/**\r
* Constructor\r
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional(readOnly = true)
public class RightsServiceImpl extends AnnotatableServiceBase<Rights, IRightsDao> implements IRightsService {
- private static final Logger logger = Logger.getLogger(RightsServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(RightsServiceImpl.class);
/**
* {@inheritDoc}
*/
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.hibernate.LockOptions;\r
import org.hibernate.Session;\r
import org.hibernate.criterion.Criterion;\r
implements IService<T>, ApplicationContextAware {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ServiceBase.class);\r
+ private static final Logger logger = LogManager.getLogger(ServiceBase.class);\r
\r
protected ApplicationContext appContext;\r
\r
\r
package eu.etaxonomy.cdm.api.service;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.springframework.stereotype.Service;\r
import org.springframework.transaction.annotation.Transactional;\r
\r
@Transactional(readOnly = true)\r
public class ServiceImpl extends ServiceBase<CdmBase, ICdmEntityDao<CdmBase>> implements IService<CdmBase> {\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(ServiceImpl.class);\r
+ private static final Logger logger = LogManager.getLogger(ServiceImpl.class);\r
\r
//@Autowired\r
//@Qualifier("mainDao")\r
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
package eu.etaxonomy.cdm.api.service;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;
/**
- *
* @author s.buers Service to provide statistic data of the database elements
*/
-
@Service
@Transactional
public class StatisticsServiceImpl implements IStatisticsService {
- private static final Logger logger = Logger
- .getLogger(StatisticsServiceImpl.class);
-
-
+ private static final Logger logger = LogManager.getLogger(StatisticsServiceImpl.class);
// this does not make sense, we just count nothing if no type is given.
// the one who calls this service should check that there are types given!
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
extends AnnotatableServiceBase<TaxonNode, ITaxonNodeDao>
implements ITaxonNodeService{
- private static final Logger logger = Logger.getLogger(TaxonNodeServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeServiceImpl.class);
@Autowired
private IBeanInitializer defaultBeanInitializer;
import javax.persistence.EntityNotFoundException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
extends IdentifiableServiceBase<TaxonBase,ITaxonDao>
implements ITaxonService{
- private static final Logger logger = Logger.getLogger(TaxonServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(TaxonServiceImpl.class);
public static final String POTENTIAL_COMBINATION_NAMESPACE = "Potential combination";
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
implements ITermNodeService {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermNodeServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(TermNodeServiceImpl.class);
@Override
@Autowired
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
implements ITermService{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TermServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(TermServiceImpl.class);
private ILanguageStringDao languageStringDao;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Service;
@Service
public class TestServiceImpl implements ITestService {
- private static final Logger logger = Logger.getLogger(TestServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(TestServiceImpl.class);
@Autowired
ITaxonNodeService taxonNodeService;
import java.util.UUID;\r
\r
import org.apache.commons.collections.buffer.CircularFifoBuffer;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.dto.CdmEntityIdentifier;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
private static final long serialVersionUID = -7040027587709706700L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(UpdateResult.class);\r
+ private static final Logger logger = LogManager.getLogger(UpdateResult.class);\r
\r
private Status status = Status.OK;\r
\r
import java.util.Collection;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
private static final long serialVersionUID = 6102562152485923714L;
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CacheUpdaterConfigurator.class);
+ private static final Logger logger = LogManager.getLogger(CacheUpdaterConfigurator.class);
private List<Class<? extends IdentifiableEntity>> classList;
private IProgressMonitor monitor;
\r
import java.io.Serializable;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
/**\r
* Base class for delete configurators.\r
\r
private static final long serialVersionUID = 8841790311273474123L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DeleteConfiguratorBase.class);\r
+ private static final Logger logger = LogManager.getLogger(DeleteConfiguratorBase.class);\r
\r
}\r
*/\r
package eu.etaxonomy.cdm.api.service.config;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.INameService;\r
\r
private static final long serialVersionUID = 76414245247942488L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(NameDeletionConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(NameDeletionConfigurator.class);\r
\r
private boolean removeAllNameRelationships = false;\r
private boolean ignoreIsBasionymFor = false;\r
\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
private static final long serialVersionUID = -4932682946459109886L;\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonDeletionConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonDeletionConfigurator.class);\r
\r
\r
private boolean deleteSynonymsIfPossible = true;\r
*/\r
package eu.etaxonomy.cdm.api.service.config;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
\r
\r
private static final long serialVersionUID = 1187266117499706532L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TaxonNodeDeletionConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TaxonNodeDeletionConfigurator.class);\r
\r
public boolean isDeleteTaxon() {\r
return isDeleteElement();\r
*/\r
package eu.etaxonomy.cdm.api.service.config;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
\r
\r
private static final long serialVersionUID = 213038079829537335L;\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TermDeletionConfigurator.class);\r
+ private static final Logger logger = LogManager.getLogger(TermDeletionConfigurator.class);\r
\r
private boolean deleteIncludedTerms = false;\r
\r
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.FlushMode;
import org.hibernate.Session;
import org.springframework.transaction.PlatformTransactionManager;
*/
public abstract class DescriptionAggregationBase<T extends DescriptionAggregationBase<T, CONFIG>, CONFIG extends DescriptionAggregationConfigurationBase<T>> {
- public static final Logger logger = Logger.getLogger(DescriptionAggregationBase.class);
+ public static final Logger logger = LogManager.getLogger(DescriptionAggregationBase.class);
private static final long BATCH_MIN_FREE_HEAP = 150 * 1024 * 1024; //800 MB
/**
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.search.Search;
import org.springframework.transaction.TransactionStatus;
public class DistributionAggregation
extends DescriptionAggregationBase<DistributionAggregation,DistributionAggregationConfiguration>{
- public static final Logger logger = Logger.getLogger(DistributionAggregation.class);
+ public static final Logger logger = LogManager.getLogger(DistributionAggregation.class);
protected static final List<String> TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String [] {
"description.elements.area",
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.common.URI;
private static final long serialVersionUID = 8329871164348514709L;
- private static final Logger logger = Logger.getLogger(DerivationTreeSummaryDTO.class);
+ private static final Logger logger = LogManager.getLogger(DerivationTreeSummaryDTO.class);
private List<Link> specimenScans = new ArrayList<>();
private List<MolecularData> molecularDataList = new ArrayList<>();
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
public class RegistrationDTO {
- private static final Logger logger = Logger.getLogger(RegistrationDTO.class);
+ private static final Logger logger = LogManager.getLogger(RegistrationDTO.class);
private String summary = "";
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.SessionFactory;
import org.hibernate.StatelessSession;
import org.hibernate.query.Query;
*/
public class RegistrationIdentifierMinter implements IdentifierMinter<String> {
- private static final Logger logger = Logger.getLogger(RegistrationIdentifierMinter.class);
+ private static final Logger logger = LogManager.getLogger(RegistrationIdentifierMinter.class);
enum Method {
naturalNumberIncrement
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import eu.etaxonomy.cdm.model.common.Language;
*/
public class TermRepresentation_L10n implements ITermRepresentation_L10n {
- public static final Logger logger = Logger.getLogger(TermRepresentation_L10n.class);
+ public static final Logger logger = LogManager.getLogger(TermRepresentation_L10n.class);
String label = null;
String abbreviatedLabel = null;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
public class CacheUpdater implements Serializable {
private static final long serialVersionUID = -1410600568024821771L;
- private static final Logger logger = Logger.getLogger(CacheUpdater.class);
+ private static final Logger logger = LogManager.getLogger(CacheUpdater.class);
@Autowired
protected INameService nameService;
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.FlushMode;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
public class SortIndexUpdaterWrapper implements Serializable {
private static final long serialVersionUID = 1152526455024556637L;
- private static final Logger logger = Logger.getLogger(SortIndexUpdaterWrapper.class);
+ private static final Logger logger = LogManager.getLogger(SortIndexUpdaterWrapper.class);
private static final String TAXON_NODE = "TaxonNode";
private static final String TERM_NODE = "TermRelation";
import javax.wsdl.WSDLException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class LsidAuthorityServiceImpl implements LSIDAuthorityService {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(LsidAuthorityServiceImpl.class);
+ private static Logger logger = LogManager.getLogger(LsidAuthorityServiceImpl.class);
private String lsidDomain;
private Integer lsidPort;
private LSIDRegistry lsidRegistry;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("lsidDataService")
@Transactional
public class LsidDataServiceImpl implements LSIDDataService {
- private static final Logger logger = Logger.getLogger(LsidDataServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(LsidDataServiceImpl.class);
private LSIDRegistry lsidRegistry;
import java.util.List;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
import eu.etaxonomy.cdm.common.URI;
@Component
public class MediaInfoFactory implements IMediaInfoFactory {
- private static final Logger logger = Logger.getLogger(MediaInfoFactory.class);
+ private static final Logger logger = LogManager.getLogger(MediaInfoFactory.class);
/**
* TODO needs to be managed in CDM PREFERENCES per service and version.
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpException;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.UriUtils;
*/
public class MediaInfoFileReader extends AbstactMediaMetadataReader {
- private static Logger logger = Logger.getLogger(MediaInfoFileReader.class);
+ private static Logger logger = LogManager.getLogger(MediaInfoFileReader.class);
public static final Integer IMAGE_READ_TIMEOUT = 3000; // ms
import java.io.InputStream;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.cybertaxonomy.media.info.model.MediaInfo;
import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class MediaInfoServiceReader extends AbstactMediaMetadataReader {
- private static final Logger logger = Logger.getLogger(MediaInfoServiceReader.class);
+ private static final Logger logger = LogManager.getLogger(MediaInfoServiceReader.class);
static private Mapper dozerMapper;
import java.util.Optional;
import java.util.regex.Matcher;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.media.ImageFile;
*/
public class MediaUriTransformationProcessor {
- private static final Logger logger = Logger.getLogger(MediaUriTransformationProcessor.class);
+ private static final Logger logger = LogManager.getLogger(MediaUriTransformationProcessor.class);
private List<MediaUriTransformation> transformations = new ArrayList<>();
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.criterion.Criterion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Transactional(readOnly = true)
public class AmplificationServiceImpl extends AnnotatableServiceBase<Amplification, IAmplificationDao> implements IAmplificationService{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AmplificationServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(AmplificationServiceImpl.class);
@Override
@Autowired
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.criterion.Criterion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Transactional(readOnly = true)
public class PrimerServiceImpl extends AnnotatableServiceBase<Primer, IPrimerDao> implements IPrimerService{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PreferenceServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(PreferenceServiceImpl.class);
@Override
public List<UuidAndTitleCache<Primer>> getPrimerUuidAndTitleCache() {
import java.util.Map.Entry;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Transactional(readOnly = true)
public class SequenceServiceImpl extends AnnotatableServiceBase<Sequence, ISequenceDao> implements ISequenceService{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(PreferenceServiceImpl.class);
+ private static final Logger logger = LogManager.getLogger(PreferenceServiceImpl.class);
@Autowired
IOccurrenceService occurrenceService;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.Hibernate;
import org.joda.time.DateTime;
import org.joda.time.Partial;
*/
private static final int PAGE_SIZE = 50;
- private static final Logger logger = Logger.getLogger(RegistrationWorkingSetService.class);
+ private static final Logger logger = LogManager.getLogger(RegistrationWorkingSetService.class);
@Autowired
@Qualifier("cdmRepository")
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.spell.Dictionary;
@Transactional
public class CdmMassIndexer implements ICdmMassIndexer {
- public static final Logger logger = Logger.getLogger(CdmMassIndexer.class);
+ public static final Logger logger = LogManager.getLogger(CdmMassIndexer.class);
private final Set<Class<? extends CdmBase>> indexedClasses = new HashSet<>();
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
*/
public class DocIdBitSetPrinter {
- public static final Logger logger = Logger.getLogger(DocIdBitSetPrinter.class);
+ public static final Logger logger = LogManager.getLogger(DocIdBitSetPrinter.class);
public static String docsAsString(DocIdSet docset, int maxdocs){
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
*/
public class LuceneMultiSearch extends LuceneSearch {
- public static final Logger logger = Logger.getLogger(LuceneMultiSearch.class);
+ public static final Logger logger = LogManager.getLogger(LuceneMultiSearch.class);
private final Set<Class<? extends CdmBase>> directorySelectClasses = new HashSet<>();
import java.util.Arrays;
import java.util.Collection;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.BooleanClause.Occur;
*/
public class LuceneSearch {
- public static final Logger logger = Logger.getLogger(LuceneSearch.class);
+ public static final Logger logger = LogManager.getLogger(LuceneSearch.class);
public final static String ID_FIELD = "id";
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
*/
public class QueryFactory {
- public static final Logger logger = Logger.getLogger(QueryFactory.class);
+ public static final Logger logger = LogManager.getLogger(QueryFactory.class);
protected ILuceneIndexToolProvider toolProvider;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.search.MultiTermQuery;
*/
public class SearchResultBuilder implements ISearchResultBuilder {
- public static final Logger logger = Logger.getLogger(SearchResultBuilder.class);
+ public static final Logger logger = LogManager.getLogger(SearchResultBuilder.class);
private Query query;
/**
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
*/
public class SearchResultHighligther {
- public static final Logger logger = Logger.getLogger(SearchResultHighligther.class);
+ public static final Logger logger = LogManager.getLogger(SearchResultHighligther.class);
public Map<String,String[]> getFragmentsWithHighlightedTerms(Analyzer analyzer, Query query, String[] fieldNames, Document doc, int fragmentNumber, int fragmentSize){
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.dao.DataAccessException;
protected static final String USER_NAME_EXISTS_MSG = "This user name is already being used by someone else.";
- private static Logger logger = Logger.getLogger(PasswordResetRequest.class);
+ private static Logger logger = LogManager.getLogger(PasswordResetRequest.class);
@Autowired
@Qualifier("accountCreationRequestTokenStore")
import org.apache.commons.collections4.map.HashedMap;
import org.apache.commons.text.StringSubstitutor;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.mail.MailException;
*/
public abstract class AccountSelfManagementService implements IRateLimitedService {
- private static Logger logger = Logger.getLogger(AccountSelfManagementService.class);
+ private static Logger logger = LogManager.getLogger(AccountSelfManagementService.class);
public static final int RATE_LIMTER_TIMEOUT_SECONDS = 2;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.dao.DataAccessException;
@Transactional(readOnly = false)
public class PasswordResetService extends AccountSelfManagementService implements IPasswordResetService {
- private static Logger logger = Logger.getLogger(PasswordResetService.class);
+ private static Logger logger = LogManager.getLogger(PasswordResetService.class);
@Autowired
@Qualifier("passwordResetTokenStore")
import java.util.stream.Collectors;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.action.spi.BeforeTransactionCompletionProcess;
extends AbstractHibernateTaxonGraphProcessor
implements BeforeTransactionCompletionProcess {
- private static final Logger logger = Logger.getLogger(TaxonGraphBeforeTransactionCompleteProcess.class);
+ private static final Logger logger = LogManager.getLogger(TaxonGraphBeforeTransactionCompleteProcess.class);
private static final String[] TAXONNAME_NAMEPARTS_OR_RANK_PROPS = new String[]{"genusOrUninomial", "specificEpithet", "rank"};
private static final String[] TAXONNAME_NOMENCLATURALSOURCE = new String[]{"nomenclaturalSource"};
if (getSession() != null ) {
// temporarySession.close(); // no need to close the session since the session is configured for auto close, see createTempSession()
if(origLoggerLevel != null){
- Logger.getLogger("org.hibernate.SQL").setLevel(origLoggerLevel);
+ Configurator.setLevel("org.hibernate.SQL", origLoggerLevel);
}
}
}
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Transactional(readOnly = true)
public class TaxonGraphServiceImpl implements ITaxonGraphService {
- static private final Logger logger = Logger.getLogger(TaxonGraphServiceImpl.class);
+ static private final Logger logger = LogManager.getLogger(TaxonGraphServiceImpl.class);
@Autowired
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy;
private static final long serialVersionUID = -2521474709047255979L;
- public static final Logger logger = Logger.getLogger(CdmUserHelper.class);
+ public static final Logger logger = LogManager.getLogger(CdmUserHelper.class);
@Autowired
private ICdmPermissionEvaluator permissionEvaluator;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.media.Media;
private SpecimenTypeDesignation newSpecimenTypeDesignation;
- private static final Logger logger = Logger.getLogger(DerivedUnitConverter.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitConverter.class);
/**
* @param specimenTypeDesignation
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.SetMap;
import eu.etaxonomy.cdm.model.common.CdmBase;
*/
public class DescriptionUtility {
- private static final Logger logger = Logger.getLogger(DescriptionUtility.class);
+ private static final Logger logger = LogManager.getLogger(DescriptionUtility.class);
/**
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.proxy.HibernateProxy;
import eu.etaxonomy.cdm.common.Tree;
*/
public class DistributionTree extends Tree<Set<Distribution>, NamedArea>{
- public static final Logger logger = Logger.getLogger(DistributionTree.class);
+ public static final Logger logger = LogManager.getLogger(DistributionTree.class);
private final IDefinedTermDao termDao;
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
* @since Jan 27, 2010
*/
public class ImagesUtility {
- private static final Logger logger = Logger.getLogger(ImagesUtility.class);
+ private static final Logger logger = LogManager.getLogger(ImagesUtility.class);
/**
* Quick and dirty method to get an element's first image file.
*/\r
package eu.etaxonomy.cdm.api.validation;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.application.ICdmRepository;\r
import eu.etaxonomy.cdm.model.common.ICdmBase;\r
class Level3TransactionalValidationEventListener extends Level3ValidationEventListener{\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(Level3TransactionalValidationEventListener.class);\r
+ private static final Logger logger = LogManager.getLogger(Level3TransactionalValidationEventListener.class);\r
\r
private final ICdmRepository repository;\r
\r
import javax.print.attribute.standard.Media;\r
import javax.validation.Validator;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
\r
import eu.etaxonomy.cdm.api.application.ICdmRepository;\r
import eu.etaxonomy.cdm.api.service.IService;\r
}\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(BatchValidationUtil.class);\r
+ private static final Logger logger = LogManager.getLogger(BatchValidationUtil.class);\r
\r
// Ideally retrieved dynamically through reflection, but got stuck on\r
// getXXXService methods in ICdmRepository returning proxies\r
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.validator.HibernateValidator;
import org.hibernate.validator.HibernateValidatorConfiguration;
import org.springframework.context.ApplicationContext;
static final Class<?>[] DEFAULT_VALIDATION_GROUPS = new Class<?>[] { Level2.class, Level3.class };
- private static final Logger logger = Logger.getLogger(BatchValidator.class);
+ private static final Logger logger = LogManager.getLogger(BatchValidator.class);
private ICdmRepository repository;
import java.io.FileNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.dbunit.annotation.ExpectedDataSet;
// private final String[] tableNames = new String[]{"USERACCOUNT", "USERACCOUNT_GRANTEDAUTHORITYIMPL", "GRANTEDAUTHORITYIMPL", "CDMMETADATA", "PERMISSIONGROUP"};
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TaxonServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonServiceImplTest.class);
@SpringBeanByType
private ITaxonService taxonService;
import java.io.FileNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@Ignore
public class CdmCacherBaseTest extends CdmIntegrationTest {
- private static final Logger logger = Logger.getLogger(CdmCacherBaseTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmCacherBaseTest.class);
@SpringBeanByType
private CdmCacherBase cdmCacherBase;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LockMode;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@Transactional(TransactionMode.DISABLED)
public class ConcurrentSessionTest extends CdmIntegrationTest {
- private static final Logger logger = Logger.getLogger(ConcurrentSessionTest.class);
+ private static final Logger logger = LogManager.getLogger(ConcurrentSessionTest.class);
@SpringBeanByType
private SessionFactory sessionFactory;
import java.io.FileNotFoundException;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.proxy.HibernateProxy;
import org.junit.Assert;
import org.junit.Before;
extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeCacheStrategyInjectionTest.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeCacheStrategyInjectionTest.class);
@SpringBeanByType
private IOccurrenceService occService;
*/
package eu.etaxonomy.cdm.api.facade;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class DerivedUnitFacadeCacheStrategyTest extends TermTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeCacheStrategyTest.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeCacheStrategyTest.class);
private DerivedUnit specimen;
private DerivationEvent derivationEvent;
*/\r
package eu.etaxonomy.cdm.api.facade;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
public class DerivedUnitFacadeFieldUnitCacheStrategyTest extends TermTestBase {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeFieldUnitCacheStrategyTest.class);\r
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeFieldUnitCacheStrategyTest.class);\r
\r
DerivedUnit specimen;\r
DerivationEvent derivationEvent;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
public class DerivedUnitFacadeTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(DerivedUnitFacadeTest.class);
+ private static final Logger logger = LogManager.getLogger(DerivedUnitFacadeTest.class);
@SpringBeanByType
import java.lang.reflect.Field;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
public class AgentServiceImplTest extends CdmTransactionalIntegrationTest{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AgentServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(AgentServiceImplTest.class);
private static final UUID UUID_EHRENBERG = UUID.fromString("6363ae88-ec57-4b23-8235-6c86fbe59446");
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
*/
public class ClassificationServiceDeepTest extends CdmTransactionalIntegrationTest{
- private static final Logger logger = Logger.getLogger(ClassificationServiceDeepTest.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationServiceDeepTest.class);
@SpringBeanByType
private IClassificationService service;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class ClassificationServiceImplTest extends CdmTransactionalIntegrationTest{
- private static final Logger logger = Logger.getLogger(ClassificationServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(ClassificationServiceImplTest.class);
@SpringBeanByType
private IClassificationService service;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
*/
public class CommonServiceImplTest extends CdmIntegrationTest {
- private static final Logger logger = Logger.getLogger(CommonServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(CommonServiceImplTest.class);
@SpringBeanByType
private ICommonService service;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
public class DescriptionServiceImplTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(DescriptionServiceImplTest.class);
+ private static Logger logger = LogManager.getLogger(DescriptionServiceImplTest.class);
@SpringBeanByType
private IDescriptionService service;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.springframework.core.env.Environment;
import org.springframework.mail.SimpleMailMessage;
public class EmailSendTest extends CdmIntegrationTest {
- private static final Logger logger = Logger.getLogger(EmailSendTest.class);
+ private static final Logger logger = LogManager.getLogger(EmailSendTest.class);
private static final String SUBJECT = "eu.etaxonomy.cdm.test.function.EmailSendTest";
import java.util.List;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Test;\r
import org.unitils.spring.annotation.SpringBeanByType;\r
\r
public class GroupServiceImplTest extends CdmTransactionalIntegrationTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(GroupServiceImplTest.class);\r
+ private static final Logger logger = LogManager.getLogger(GroupServiceImplTest.class);\r
\r
@SpringBeanByType\r
IGroupService groupService;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.hibernate.LazyInitializationException;
import org.junit.Assert;
import org.junit.Test;
public class HandlingCdmEntitiesTest extends CdmIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CommonServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(CommonServiceImplTest.class);
private static final String LIE_TEAMMEMBERS_NOSESSION = "failed to lazily initialize a collection of role: eu.etaxonomy.cdm.model.agent.Team.teamMembers, could not initialize proxy - no Session";
private static final String LIE_NOSESSION = "could not initialize proxy .* no Session";
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.database.annotations.Transactional;
public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(IdentifiableServiceBaseTest.class);
+ private static final Logger logger = LogManager.getLogger(IdentifiableServiceBaseTest.class);
@SpringBeanByType
private INameService nameService;
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
*/
public class NameServiceImplTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(NameServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(NameServiceImplTest.class);
private static final UUID NAME1_UUID = UUID.fromString("6dbd41d1-fe13-4d9c-bb58-31f051c2c384");
private static final int NAME1_ID = 10;
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
public class NaturalLanguageGeneratorTest extends CdmIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(NaturalLanguageGeneratorTest.class);
+ private static final Logger logger = LogManager.getLogger(NaturalLanguageGeneratorTest.class);
@SpringBeanByType
private INaturalLanguageGenerator generator;
import java.io.FileNotFoundException;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.spring.annotation.SpringBeanByType;
private final UUID FIELD_UNIT2_UUID = UUID.fromString("ae798108-6483-4d09-900f-7f849c43bcc9");
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(OccurrenceServiceDeepDeleteTest.class);
+ private static final Logger logger = LogManager.getLogger(OccurrenceServiceDeepDeleteTest.class);
@SpringBeanByType
private IOccurrenceService occurrenceService;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.spring.annotation.SpringBeanByType;
*/
public class OccurrenceServiceTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(OccurrenceServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(OccurrenceServiceTest.class);
@SpringBeanByType
private IOccurrenceService occurrenceService;
import java.io.FileNotFoundException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.BeforeClass;\r
import org.junit.Ignore;\r
*/\r
@Ignore\r
public class PolytomousKeyServiceImplTest extends CdmTransactionalIntegrationTest {\r
- private static final Logger logger = Logger.getLogger(PolytomousKeyServiceImplTest.class);\r
+ private static final Logger logger = LogManager.getLogger(PolytomousKeyServiceImplTest.class);\r
\r
@SpringBeanByType\r
private IPolytomousKeyService service;\r
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.spring.annotation.SpringBeanByType;
public class ReferenceServiceImplTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(ReferenceServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(ReferenceServiceImplTest.class);
private static final UUID REFERENCE1_UUID = UUID.fromString("4857d1f5-77d1-4583-87c4-f0d08fcfefcc");
private static final UUID REFERENCE2_UUID = UUID.fromString("fcdfb0cc-9ef6-48e3-ad56-492614491c73");
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class)
public class SecurityTest extends AbstractSecurityTestBase{
- private static final Logger logger = Logger.getLogger(SecurityTest.class);
+ private static final Logger logger = LogManager.getLogger(SecurityTest.class);
@SpringBeanByType
private ITaxonService taxonService;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
public class SecurityWithTransaction extends CdmTransactionalIntegrationTestWithSecurity {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(SecurityWithTransaction.class);
+ private static final Logger logger = LogManager.getLogger(SecurityWithTransaction.class);
@SpringBeanByName
private ITaxonService taxonService;
import java.util.Map;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.unitils.spring.annotation.SpringBeanByType;
*/
public class StatisticsServiceImplTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(StatisticsServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(StatisticsServiceImplTest.class);
// constant if you want to printout the database content to console:
// only recommended for a small probe
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
*/
public class TaxonNodeDtoByNameComparatorTest {
- private static final Logger logger = Logger.getLogger(TaxonNodeDtoByNameComparatorTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonNodeDtoByNameComparatorTest.class);
@Test
@Ignore
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
*/
public class TaxonServiceImplTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(TaxonServiceImplTest.class);
+ private static final Logger logger = LogManager.getLogger(TaxonServiceImplTest.class);
@SpringBeanByType
private ITaxonService service;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class TaxonServiceSearchTaxaAndNamesTest extends CdmTransactionalIntegrationTest {
- private static Logger logger = Logger.getLogger(TaxonServiceSearchTaxaAndNamesTest.class);
+ private static Logger logger = LogManager.getLogger(TaxonServiceSearchTaxaAndNamesTest.class);
private static final String ABIES_BALSAMEA_UUID = "f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8";
import java.util.UUID;\r
\r
import org.apache.commons.lang.RandomStringUtils;\r
-import org.apache.log4j.Level;\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.Level;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
import org.apache.lucene.document.Document;\r
import org.junit.Assert;\r
import org.junit.Before;\r
*/\r
public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {\r
\r
- private static Logger logger = Logger.getLogger(TaxonServiceSearchTest.class);\r
+ private static Logger logger = LogManager.getLogger(TaxonServiceSearchTest.class);\r
\r
private static final int BENCHMARK_ROUNDS = 300;\r
\r
if(level == null){\r
level = Level.DEBUG;\r
}\r
- if(logger.isEnabledFor(level)){\r
+ if(logger.isEnabled(level)){\r
StringBuilder b = new StringBuilder();\r
b.append("\n");\r
int i = 0;\r
import java.util.Set;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Ignore;\r
import org.junit.Test;\r
import org.unitils.dbunit.annotation.DataSet;\r
*/\r
public class TermServiceImplTest extends CdmTransactionalIntegrationTest{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TermServiceImplTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TermServiceImplTest.class);\r
\r
@SpringBeanByType\r
private ITermService termService;\r
import java.util.List;\r
import java.util.Set;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Assert;\r
import org.junit.Test;\r
import org.springframework.security.access.AccessDeniedException;\r
@DataSet(value="SecurityTest.xml")\r
public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {\r
\r
- protected static final Logger logger = Logger.getLogger(UserAndGroupServiceImplTest.class);\r
+ protected static final Logger logger = LogManager.getLogger(UserAndGroupServiceImplTest.class);\r
\r
@SpringBeanByType\r
private AuthenticationManager authenticationManager;\r
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
public class DescriptiveDataSetServiceTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(DescriptiveDataSetServiceTest.class);
+ private static Logger logger = LogManager.getLogger(DescriptiveDataSetServiceTest.class);
private static final UUID T_LAPSANA_UUID = UUID.fromString("f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8");
import java.util.Set;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class DistributionAggregationTest extends CdmTransactionalIntegrationTest {
- private static Logger logger = Logger.getLogger(DistributionAggregationTest.class);
+ private static Logger logger = LogManager.getLogger(DistributionAggregationTest.class);
private static final UUID T_LAPSANA_UUID = UUID.fromString("f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8");
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class StructuredDescriptionAggregationTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(StructuredDescriptionAggregationTest.class);
+ private static Logger logger = LogManager.getLogger(StructuredDescriptionAggregationTest.class);
private static final UUID T_LAPSANA_UUID = UUID.fromString("f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8");
private static final UUID TN_LAPSANA_UUID = UUID.fromString("f4d29e9f-6484-4184-af2e-9704e96a17e3");
import java.util.Map;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
private static final String OFFLINE = "OFFLINE";
- public static final Logger logger = Logger.getLogger(MediaInfoFileReaderTest.class);
+ public static final Logger logger = LogManager.getLogger(MediaInfoFileReaderTest.class);
private URI jpegUri;
private URI tiffUri;
import java.net.URISyntaxException;
import org.apache.http.HttpException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
*/
public class MediaInfoServiceReaderTest {
- public static final Logger logger = Logger.getLogger(MediaInfoServiceReaderTest.class);
+ public static final Logger logger = LogManager.getLogger(MediaInfoServiceReaderTest.class);
@Before
public void setUp() throws Exception {}
import java.io.FileNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.spring.annotation.SpringBeanByType;
public class AmplificationServiceTest extends CdmTransactionalIntegrationTest {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(AmplificationServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(AmplificationServiceTest.class);
@SpringBeanByType
private IAmplificationService amplificationService;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.spring.annotation.SpringBeanByType;
*
*/
public class PrimerServiceTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(PrimerServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(PrimerServiceTest.class);
@SpringBeanByType
private IPrimerService primerService;
import java.io.FileNotFoundException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.unitils.spring.annotation.SpringBeanByType;
*
*/
public class SequenceServiceTest extends CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(SequenceServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(SequenceServiceTest.class);
@SpringBeanByType
private ISequenceService sequenceService;
import javax.mail.internet.AddressException;
import javax.mail.internet.MimeMessage;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
private static final double maxRequestRate = 4.0;
- Logger logger = Logger.getLogger(AccountRegistrationServiceTest.class);
+ Logger logger = LogManager.getLogger(AccountRegistrationServiceTest.class);
private static final int rateLimiterTimeout = 200;
private static final String userName = "pwdResetTestUser";
@Before
public void accountRegistrationService() throws InterruptedException {
- logger.setLevel(Level.DEBUG);
- Logger.getLogger(PasswordResetRequest.class).setLevel(Level.TRACE);
+ Configurator.setLevel(logger, Level.DEBUG);
+ Configurator.setLevel(PasswordResetRequest.class, Level.TRACE);
// speed up testing
accountRegistrationService.setRateLimiterTimeout(Duration.ofMillis(rateLimiterTimeout));
accountRegistrationService.setRate(maxRequestRate);
import javax.mail.internet.MimeMessage;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
*/
public class PasswordResetServiceTest extends eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest {
- private static final Logger logger = Logger.getLogger(PasswordResetServiceTest.class);
+ private static final Logger logger = LogManager.getLogger(PasswordResetServiceTest.class);
private static final double maxRequestRate = 4.0;
@Before
public void resetPasswordResetService() throws InterruptedException {
- logger.setLevel(Level.DEBUG);
- Logger.getLogger(PasswordResetRequest.class).setLevel(Level.TRACE);
+ Configurator.setLevel(logger, Level.DEBUG);
+ Configurator.setLevel(PasswordResetRequest.class, Level.TRACE);
// speed up testing
passwordResetService.setRateLimiterTimeout(Duration.ofMillis(rateLimiterTimeout));
passwordResetService.setRate(maxRequestRate);
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
* @version 1.0
*/
public class FixMultipleTextDataInImageGalleries {
- public static final Logger logger = Logger.getLogger(FixMultipleTextDataInImageGalleries.class);
+ public static final Logger logger = LogManager.getLogger(FixMultipleTextDataInImageGalleries.class);
public static ICdmDataSource dataSource(){
DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.service.description.AggregationMode;
*/
public class TestAggregations {
- private static final Logger logger = Logger.getLogger(TestAggregations.class);
+ private static final Logger logger = LogManager.getLogger(TestAggregations.class);
private void testNewConfigControler(){
logger.debug("start");
package eu.etaxonomy.cdm.test.function;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@Ignore /* IGNORE in Suite */
public class TestC3P0Configuration{
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TestC3P0Configuration.class);
+ private static final Logger logger = LogManager.getLogger(TestC3P0Configuration.class);
CdmApplicationController appController;
import java.util.Collection;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.junit.Ignore;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@Ignore
public class TestConversationEnabled implements IConversationEnabled {
- private static final Logger logger = Logger.getLogger(TestConversationEnabled.class);
+ private static final Logger logger = LogManager.getLogger(TestConversationEnabled.class);
// private ConversationHolder conversationHolder;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
public class TestModelUpdate {
@SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(TestModelUpdate.class);
+ private static final Logger logger = LogManager.getLogger(TestModelUpdate.class);
private void testSelectedDb(){
DbSchemaValidation schema = DbSchemaValidation.VALIDATE;
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.transaction.TransactionStatus;
public class TestScriptService {
- private static final Logger logger = Logger.getLogger(TestScriptService.class);
+ private static final Logger logger = LogManager.getLogger(TestScriptService.class);
private void testNewConfigControler(){
UUID uuid1 = botName1.getUuid();
UUID uuid2 = botName2.getUuid();
try {
- Logger loggerTrace = Logger.getLogger("org.hibernate.type");
+ @SuppressWarnings("unused")
+ Logger loggerTrace = LogManager.getLogger("org.hibernate.type");
//loggerTrace.setLevel(Level.TRACE);
System.out.println(logger.getName());
import java.io.FileNotFoundException;\r
import java.util.UUID;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
public class TermLoaderIntegrationTest extends CdmIntegrationTest {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(TermLoaderIntegrationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(TermLoaderIntegrationTest.class);\r
\r
private UUID taxonomicallyIncludedInUuid;\r
\r
\r
package eu.etaxonomy.cdm.test.suite;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Ignore;\r
import org.junit.runner.RunWith;\r
import org.junit.runners.Suite;\r
}\r
)\r
public class CdmTestSuite {\r
- static Logger logger = Logger.getLogger(CdmTestSuite.class);\r
+ static Logger logger = LogManager.getLogger(CdmTestSuite.class);\r
\r
// the class remains completely empty,\r
// being used only as a holder for the above annotations\r
import javax.validation.Validator;\r
import javax.validation.groups.Default;\r
\r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
import org.junit.Before;\r
import org.junit.Test;\r
import org.unitils.dbunit.annotation.DataSet;\r
*/\r
@SuppressWarnings("unused")\r
public class ValidationTest extends CdmTransactionalIntegrationTest {\r
- private static final Logger logger = Logger.getLogger(ValidationTest.class);\r
+ private static final Logger logger = LogManager.getLogger(ValidationTest.class);\r
\r
@SpringBeanByType\r
private Validator validator;\r
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.database.DatabaseDataSet;
@Component
public class DataBaseTablePrinter {
- protected static final Logger logger = Logger.getLogger(DataBaseTablePrinter.class);
+ protected static final Logger logger = LogManager.getLogger(DataBaseTablePrinter.class);
@Autowired
protected DataSource dataSource;
import javax.annotation.PostConstruct;
import javax.sql.DataSource;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.database.IDatabaseConnection;
public class TestingTermInitializer extends DefaultTermInitializer {
- private static final Logger logger = Logger.getLogger(TestingTermInitializer.class);
+ private static final Logger logger = LogManager.getLogger(TestingTermInitializer.class);
protected PlatformTransactionManager transactionManager;
protected DefaultTransactionDefinition txDefinition = new DefaultTransactionDefinition();
import java.util.List;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@Repository
public class TestingTermVocabularyDao {
- private static final Logger logger = Logger.getLogger(TestingTermVocabularyDao.class);
+ private static final Logger logger = LogManager.getLogger(TestingTermVocabularyDao.class);
@Autowired
private SessionFactory factory;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.hibernate.MappingException;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.Type;
//see also TableGeneratorGlobalOverride
public class TableGenerator extends org.hibernate.id.enhanced.TableGenerator {
- private static final Logger logger = Logger.getLogger(TableGenerator.class);
+ private static final Logger logger = LogManager.getLogger(TableGenerator.class);
@Override
public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {
package eu.etaxonomy.cdm.profiler;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.yourkit.api.Controller;
//TODO move to common
public class ProfileController {
- private static final Logger logger = Logger.getLogger(ProfileController.class);
+ private static final Logger logger = LogManager.getLogger(ProfileController.class);
private static Controller controller;
private static int memSnapshotCnt = 0;
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.profiler;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.yourkit.api.Controller;
//TODO move to common
public class ProfilerController {
- private static final Logger logger = Logger.getLogger(ProfilerController.class);
+ private static final Logger logger = LogManager.getLogger(ProfilerController.class);
private static Controller controller;
private static int memSnapshotCnt = 0;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.database.IDatabaseConnection;
@HibernateSessionFactory({"/eu/etaxonomy/cdm/hibernate.cfg.xml", "/eu/etaxonomy/cdm/hibernate-test.cfg.xml"})
public abstract class CdmIntegrationTest extends UnitilsJUnit4 {
- private static final Logger logger = Logger.getLogger(CdmIntegrationTest.class);
+ private static final Logger logger = LogManager.getLogger(CdmIntegrationTest.class);
private static final String PROPERTY_H2_SERVER = "h2Server";
private static final String H2_SERVER_RUNNING = "h2ServerIsRunning";
*/
package eu.etaxonomy.cdm.test.integration;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@Transactional(TransactionMode.DISABLED) // NOTE: we are handling transaction by ourself in this class, thus we prevent unitils from creating transactions
public abstract class CdmTransactionalIntegrationTest extends CdmIntegrationTest {
- protected static final Logger logger = Logger.getLogger(CdmTransactionalIntegrationTest.class);
+ protected static final Logger logger = LogManager.getLogger(CdmTransactionalIntegrationTest.class);
/**
* The transaction manager to use
*/
protected void commitAndStartNewTransaction(final String[] tableNames) {
commit();
- if(tableNames != null && logger.isEnabledFor(Level.DEBUG)){
+ if(tableNames != null && logger.isDebugEnabled()){
printDataSet(System.out, tableNames);
// careful, the following will overwrite existing files:
// writeDbUnitDataSetFile(tableNames);
*/
package eu.etaxonomy.cdm.test.integration;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.security.access.AccessDeniedException;
import org.unitils.spring.annotation.SpringApplicationContext;
@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/applicationContext-securityTest.xml")
public abstract class CdmTransactionalIntegrationTestWithSecurity extends CdmTransactionalIntegrationTest {
- public static final Logger logger = Logger.getLogger(CdmTransactionalIntegrationTestWithSecurity.class);
+ public static final Logger logger = LogManager.getLogger(CdmTransactionalIntegrationTestWithSecurity.class);
/**
* Finds a nested RuntimeExceptions of the types {@link PermissionDeniedException}, {@link AccessDeniedException}
import java.sql.SQLException;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.dbunit.DatabaseUnitException;
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.xml.FlatXmlDataSet;
*/
public class CleanSweepInsertLoadStrategy extends CleanInsertLoadStrategy {
- protected static final Logger logger = Logger.getLogger(CleanSweepInsertLoadStrategy.class);
+ protected static final Logger logger = LogManager.getLogger(CleanSweepInsertLoadStrategy.class);
private static String clearDataResource = "eu/etaxonomy/cdm/database/ClearDBDataSet.xml";
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.17.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.17.2</version>
+ </dependency>
+
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
BGBM BDI Projects / cdmlib.git / commitdiff