Mercurial > dive4elements > river
changeset 9726:0a5239a1e46e 3.2.x
Upgrade to Log4j 2
line wrap: on
line diff
--- a/artifacts/bin/run.sh Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/bin/run.sh Wed Mar 02 10:26:50 2022 +0100 @@ -21,5 +21,5 @@ -Dwsplgen.bin.path="$DIR/bin/wsplgen" \ -Dwsplgen.log.output=false \ -Dartifact.database.dir="$DIR/conf" \ - -Dlog4j.configuration="file://$DIR/conf/log4j.properties" \ + -Dlog4j2.configurationFile="file://$DIR/conf/log4j2.xml" \ $APP
--- a/artifacts/doc/conf/log4j.properties Fri Feb 25 17:17:56 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -log4j.rootLogger=DEBUG, FLYS - -########## EXTERNAL PACKAGES -log4j.category.org.hibernate=WARN -log4j.category.net.sf.ehcache=WARN -log4j.category.org.eclipse=WARN -log4j.category.org.restlet=INFO - - -########## APPENDER SETTINGS -log4j.appender.FLYS.layout=org.apache.log4j.PatternLayout -log4j.appender.FLYS.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c{1} - %m%n - - -log4j.appender.FLYS=org.apache.log4j.RollingFileAppender -log4j.appender.FLYS.File=/var/log/d4e-river/d4e-server.log -log4j.appender.FLYS.MaxFileSize=5000KB -log4j.appender.FLYS.MaxBackupIndex=1 - -log4j.logger.org.dive4elements.artifactdatabase.rest.Standalone=INFO, START -log4j.appender.START=org.apache.log4j.ConsoleAppender -log4j.appender.START.Target = System.out -log4j.appender.START.layout = org.apache.log4j.PatternLayout -log4j.appender.START.layout.ConversionPattern=%d %m%n
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/doc/conf/log4j2.xml Wed Mar 02 10:26:50 2022 +0100 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <RollingFile + name="RollingFile" + fileName="/var/log/d4e-river/d4e-server.log" + filePattern="/var/log/d4e-river/d4e-server.log.%i"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n"/> + <SizeBasedTriggeringPolicy size="5000 KB"/> + <DefaultRolloverStrategy max="1"/> + </RollingFile> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %m%n"/> + </Console> + </Appenders> + <Loggers> + <Root level="DEBUG"> + <AppenderRef ref="RollingFile"/> + </Root> + <Logger name="org.hibernate" level="WARN" additivity="false"/> + <Logger name="net.sf.ehcache" level="WARN" additivity="false"/> + <Logger name="org.eclipse" level="WARN" additivity="false"/> + <Logger name="org.restlet" level="INFO" additivity="false"/> + <Logger name="org.dive4elements.artifactdatabase.rest.Standalone" + level="INFO"> + <AppenderRef ref="Console"/> + </Logger> + </Loggers> +</Configuration>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AbstractStaticStateArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AbstractStaticStateArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.Collection; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -42,7 +43,7 @@ private transient StaticState staticstate; private static final Logger log = - Logger.getLogger(AbstractStaticStateArtifact.class); + LogManager.getLogger(AbstractStaticStateArtifact.class); /** * Get a list containing the one and only State.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.ArtifactFactory; @@ -46,7 +47,7 @@ implements FacetTypes { /** The log for this class. */ - private static Logger log = Logger.getLogger(AnnotationArtifact.class); + private static Logger log = LogManager.getLogger(AnnotationArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "annotation";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AreaArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AreaArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -59,7 +60,7 @@ /** Own log. */ private static final Logger log = - Logger.getLogger(AreaArtifact.class); + LogManager.getLogger(AreaArtifact.class); /** Return given name. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.DefaultOutput; @@ -35,7 +36,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(BedHeightsArtifact.class); + LogManager.getLogger(BedHeightsArtifact.class); /** Artifact name. */ private static final String NAME = "bedheights";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ChartArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ChartArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.List; @@ -41,7 +42,7 @@ public class ChartArtifact extends D4EArtifact { private static final Logger log = - Logger.getLogger(ChartArtifact.class); + LogManager.getLogger(ChartArtifact.class); @Override public void setup(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; import java.util.NavigableMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -73,7 +74,7 @@ /** Own log. */ private static final Logger log = - Logger.getLogger(CrossSectionArtifact.class); + LogManager.getLogger(CrossSectionArtifact.class); static { // TODO: Move to configuration.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,7 +29,8 @@ import net.sf.ehcache.Cache; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -75,7 +76,7 @@ public class D4EArtifact extends DefaultArtifact { /** The log that is used in this artifact. */ - private static Logger log = Logger.getLogger(D4EArtifact.class); + private static Logger log = LogManager.getLogger(D4EArtifact.class); public static final String COMPUTING_CACHE = "computed.values";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ExternalWMSArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ExternalWMSArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -31,7 +32,7 @@ public static final String NAME = "external_wms"; private static final Logger log = - Logger.getLogger(ExternalWMSArtifact.class); + LogManager.getLogger(ExternalWMSArtifact.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/FixationArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/FixationArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import org.dive4elements.river.model.FastCrossSectionLine; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * The default fixation analysis artifact. @@ -32,7 +33,7 @@ implements WaterLineArtifact { /** The log for this class. */ - private static Logger log = Logger.getLogger(FixationArtifact.class); + private static Logger log = LogManager.getLogger(FixationArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "fixanalysis";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityMeasurementArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityMeasurementArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.DefaultOutput; @@ -44,7 +45,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(FlowVelocityMeasurementArtifact.class); + LogManager.getLogger(FlowVelocityMeasurementArtifact.class); /** Artifact key name. */ private static final String NAME = "flowvelocitymeasurement";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityModelArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityModelArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.DefaultOutput; @@ -42,7 +43,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(FlowVelocityModelArtifact.class); + LogManager.getLogger(FlowVelocityModelArtifact.class); /** Artifact key name. */ private static final String NAME = "flowvelocitymodel";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.Map; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -48,7 +49,7 @@ implements FacetTypes { /** The log for this class. */ - private static Logger log = Logger.getLogger(GaugeDischargeArtifact.class); + private static Logger log = LogManager.getLogger(GaugeDischargeArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "gaugedischarge";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeCurveArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeCurveArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -44,7 +45,7 @@ { /** Private log. */ private static final Logger log = - Logger.getLogger(GaugeDischargeCurveArtifact.class); + LogManager.getLogger(GaugeDischargeCurveArtifact.class); public static final String XPATH_RIVER = "/art:action/art:river/@art:name"; public static final String XPATH_GAUGE =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/HYKArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/HYKArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -42,7 +43,7 @@ /** Own log. */ private static final Logger log = - Logger.getLogger(HYKArtifact.class); + LogManager.getLogger(HYKArtifact.class); static { // TODO: Move to configuration.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -56,7 +57,7 @@ implements FacetTypes { /** The log for this class. */ - private static Logger log = Logger.getLogger(MainValuesArtifact.class); + private static Logger log = LogManager.getLogger(MainValuesArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "mainvalue";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ManualPointsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ManualPointsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.json.JSONArray; import org.json.JSONException; import org.w3c.dom.Document; @@ -38,7 +39,7 @@ private static final long serialVersionUID = 7096025125474986011L; /** The log for this class. */ - private static Logger log = Logger.getLogger(ManualPointsArtifact.class); + private static Logger log = LogManager.getLogger(ManualPointsArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "manualpoints";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MapArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MapArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,7 +27,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ public class MapArtifact extends D4EArtifact { private static final Logger log = - Logger.getLogger(MapArtifact.class); + LogManager.getLogger(MapArtifact.class); @Override public void setup(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/QSectorArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/QSectorArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -41,7 +42,7 @@ extends StaticD4EArtifact { /** The log for this class. */ - private static Logger log = Logger.getLogger(QSectorArtifact.class); + private static Logger log = LogManager.getLogger(QSectorArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "qsector";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Deprecated public class RiverAxisArtifact extends WMSDBArtifact { @@ -32,7 +33,7 @@ private static final Logger log = - Logger.getLogger(RiverAxisArtifact.class); + LogManager.getLogger(RiverAxisArtifact.class); @Override @@ -63,7 +64,7 @@ public static class RiverAxisState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(RiverAxisState.class); + LogManager.getLogger(RiverAxisState.class); protected Geometry geom; protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.data.DefaultStateData; @@ -32,7 +33,7 @@ extends StaticD4EArtifact { private static final Logger log = - Logger.getLogger(SQRelationArtifact.class); + LogManager.getLogger(SQRelationArtifact.class); public static final String XPATH_RIVER = "/art:action/art:river/@art:name"; public static final String XPATH_STATION =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentDensityArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentDensityArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.DefaultOutput; @@ -38,7 +39,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(SedimentDensityArtifact.class); + LogManager.getLogger(SedimentDensityArtifact.class); /** Artifact key name. */ private static final String NAME = "sedimentdensity";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticD4EArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticD4EArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.Collection; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -37,7 +38,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(StaticD4EArtifact.class); + LogManager.getLogger(StaticD4EArtifact.class); /** * Create description document which includes outputmodes.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticMorphWidthArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticMorphWidthArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.DefaultOutput; @@ -30,7 +31,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(StaticMorphWidthArtifact.class); + LogManager.getLogger(StaticMorphWidthArtifact.class); private static final String NAME = "morph-width"; private static final String STATIC_FACET_NAME = "morph-width";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -43,7 +43,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -60,7 +61,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(StaticWKmsArtifact.class); + LogManager.getLogger(StaticWKmsArtifact.class); private static final String NAME = "staticwkms";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -52,7 +53,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(StaticWQKmsArtifact.class); + LogManager.getLogger(StaticWQKmsArtifact.class); public static final String STATIC_STATE_NAME = "state.additional_wqkms.static";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -60,7 +60,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -73,7 +74,7 @@ implements FacetTypes, WaterLineArtifact { /** The log for this class. */ - private static Logger log = Logger.getLogger(WINFOArtifact.class); + private static Logger log = LogManager.getLogger(WINFOArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "winfo";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBackgroundArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBackgroundArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallMeta; @@ -26,7 +27,7 @@ public static final String NAME = "wmsbackground"; private static final Logger log = - Logger.getLogger(WMSBackgroundArtifact.class); + LogManager.getLogger(WMSBackgroundArtifact.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -60,7 +61,7 @@ public static class BuildingsState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(BuildingsState.class); + LogManager.getLogger(BuildingsState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSDBArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSDBArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,13 +27,14 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; public abstract class WMSDBArtifact extends StaticD4EArtifact { - private static final Logger log = Logger.getLogger(WMSDBArtifact.class); + private static final Logger log = LogManager.getLogger(WMSDBArtifact.class); @Override public void setup( @@ -100,7 +101,7 @@ public static abstract class WMSDBState extends DefaultState { - private static final Logger log = Logger.getLogger(WMSDBState.class); + private static final Logger log = LogManager.getLogger(WMSDBState.class); protected D4EArtifact artifact;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFixpointsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFixpointsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSFixpointsArtifact.class); + LogManager.getLogger(WMSFixpointsArtifact.class); @Override @@ -64,7 +65,7 @@ public static class FixpointsState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(FixpointsState.class); + LogManager.getLogger(FixpointsState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmapsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmapsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSFloodmapsArtifact.class); + LogManager.getLogger(WMSFloodmapsArtifact.class); @Override @@ -64,7 +65,7 @@ public static class FloodmapsState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(FloodmapsState.class); + LogManager.getLogger(FloodmapsState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmarksArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmarksArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSFloodmarksArtifact.class); + LogManager.getLogger(WMSFloodmarksArtifact.class); @Override @@ -64,7 +65,7 @@ public static class FloodmarksState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(FloodmarksState.class); + LogManager.getLogger(FloodmarksState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodplainArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodplainArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSFloodplainArtifact.class); + LogManager.getLogger(WMSFloodplainArtifact.class); @Override @@ -64,7 +65,7 @@ public static class FloodplainState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(FloodplainState.class); + LogManager.getLogger(FloodplainState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSLinesArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSLinesArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSHWSLinesArtifact.class); + LogManager.getLogger(WMSHWSLinesArtifact.class); @Override @@ -64,7 +65,7 @@ public static class HWSLinesState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(HWSLinesState.class); + LogManager.getLogger(HWSLinesState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSPointsArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSPointsArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSHWSPointsArtifact.class); + LogManager.getLogger(WMSHWSPointsArtifact.class); @Override @@ -64,7 +65,7 @@ public static class HWSPointsState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(HWSPointsState.class); + LogManager.getLogger(HWSPointsState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSHydrBoundaryArtifact.class); + LogManager.getLogger(WMSHydrBoundaryArtifact.class); @Override @@ -65,7 +66,7 @@ extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(HydrBoundaryState.class); + LogManager.getLogger(HydrBoundaryState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryPolyArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryPolyArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSHydrBoundaryPolyArtifact.class); + LogManager.getLogger(WMSHydrBoundaryPolyArtifact.class); @Override @@ -65,7 +66,7 @@ extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(HydrBoundaryPolyState.class); + LogManager.getLogger(HydrBoundaryPolyState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSJettiesArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSJettiesArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSJettiesArtifact.class); + LogManager.getLogger(WMSJettiesArtifact.class); @Override @@ -64,7 +65,7 @@ public static class JettiesState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(JettiesState.class); + LogManager.getLogger(JettiesState.class); protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSKmArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSKmArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; @@ -39,7 +40,7 @@ public static final String NAME = "wmskm"; - private static final Logger log = Logger.getLogger(WMSKmArtifact.class); + private static final Logger log = LogManager.getLogger(WMSKmArtifact.class); @Override @@ -85,7 +86,7 @@ public static class WMSKmState extends WMSDBState implements FacetTypes { - private static final Logger log = Logger.getLogger(WMSKmState.class); + private static final Logger log = LogManager.getLogger(WMSKmState.class); protected Geometry geom; protected int riverId;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSQPSArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSQPSArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -33,7 +34,7 @@ private static final Logger log = - Logger.getLogger(WMSQPSArtifact.class); + LogManager.getLogger(WMSQPSArtifact.class); @Override @@ -64,7 +65,7 @@ public static class WMSQPSState extends WMSDBState implements FacetTypes { private static final Logger log = - Logger.getLogger(WMSQPSState.class); + LogManager.getLogger(WMSQPSState.class); public WMSQPSState(WMSDBArtifact artifact) { super(artifact);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WQKmsInterpolArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WQKmsInterpolArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -49,7 +50,7 @@ { /** The log for this class. */ private static Logger log = - Logger.getLogger(WQKmsInterpolArtifact.class); + LogManager.getLogger(WQKmsInterpolArtifact.class); /** State name. */ public static final String STATIC_STATE_NAME =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WaterlevelArtifact.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WaterlevelArtifact.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -36,7 +37,7 @@ public class WaterlevelArtifact extends WINFOArtifact { /** The log for this class. */ - private static Logger log = Logger.getLogger(WaterlevelArtifact.class); + private static Logger log = LogManager.getLogger(WaterlevelArtifact.class); /** The name of the artifact. */ public static final String ARTIFACT_NAME = "waterlevel";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/Access.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/Access.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,11 +22,12 @@ import java.util.ArrayList; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Access { - private static Logger log = Logger.getLogger(Access.class); + private static Logger log = LogManager.getLogger(Access.class); protected D4EArtifact artifact;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; @@ -21,7 +22,7 @@ public class BedDifferencesAccess extends RangeAccess { - private static Logger log = Logger.getLogger(BedDifferencesAccess.class); + private static Logger log = LogManager.getLogger(BedDifferencesAccess.class); private String yearEpoch; private String [] diffs;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,13 +13,14 @@ import gnu.trove.TIntArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class BedHeightAccess extends RangeAccess { - private static final Logger log = Logger.getLogger(BedHeightAccess.class); + private static final Logger log = LogManager.getLogger(BedHeightAccess.class); private int[] singleIDs; private int[] epochIDs;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedQualityAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedQualityAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.LinkedList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ public class BedQualityAccess extends RangeAccess { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(BedQualityAccess.class); private List<String> bedDiameter;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/Calculation4Access.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/Calculation4Access.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,14 +15,15 @@ import java.util.Collections; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.utils.DoubleUtil; public class Calculation4Access extends RangeAccess { - private static Logger log = Logger.getLogger(Calculation4Access.class); + private static Logger log = LogManager.getLogger(Calculation4Access.class); protected List<Segment> segments;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/ExtremeAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/ExtremeAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,14 +17,15 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Access data used for extreme value analysis. */ public class ExtremeAccess extends RangeAccess { /** Our private log. */ - private static Logger log = Logger.getLogger(ExtremeAccess.class); + private static Logger log = LogManager.getLogger(ExtremeAccess.class); protected Long start; protected Long end;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,13 +12,14 @@ import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Access for Fixation related data. */ public class FixAccess extends RangeAccess { - private static Logger log = Logger.getLogger(FixAccess.class); + private static Logger log = LogManager.getLogger(FixAccess.class); protected Long start; protected Long end;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAnalysisAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAnalysisAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,12 +17,13 @@ import java.util.Arrays; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class FixAnalysisAccess extends FixAccess { - private static Logger log = Logger.getLogger(FixAnalysisAccess.class); + private static Logger log = LogManager.getLogger(FixAnalysisAccess.class); protected DateRange referencePeriod; protected DateRange [] analysisPeriods;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixRealizingAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixRealizingAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,14 +14,15 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Fix-Realizing (Volmer/Ausgelagerte Wasserspiegellage) access. */ public class FixRealizingAccess extends FixAccess { - private static Logger log = Logger.getLogger(FixRealizingAccess.class); + private static Logger log = LogManager.getLogger(FixRealizingAccess.class); protected Boolean isQ;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RangeAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RangeAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.WINFOArtifact; @@ -24,7 +25,7 @@ public class RangeAccess extends RiverAccess { - private static Logger log = Logger.getLogger(RangeAccess.class); + private static Logger log = LogManager.getLogger(RangeAccess.class); public static enum KM_MODE { RANGE, LOCATIONS, NONE };
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RiverAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RiverAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,14 +14,15 @@ import org.dive4elements.river.model.River; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Access to river data of an artifact. */ public class RiverAccess extends Access { /** Private log. */ - private static Logger log = Logger.getLogger(RiverAccess.class); + private static Logger log = LogManager.getLogger(RiverAccess.class); /** River name. */ protected String river;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SQRelationAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SQRelationAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.DateRange; @@ -20,7 +21,7 @@ public class SQRelationAccess extends RiverAccess { - private static Logger log = Logger.getLogger(SQRelationAccess.class); + private static Logger log = LogManager.getLogger(SQRelationAccess.class); protected Double location;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import gnu.trove.TIntArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; @@ -18,7 +19,7 @@ public class SedimentLoadAccess extends RangeAccess { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( SedimentLoadAccess.class); private String time;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/StaticSQRelationAccess.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/StaticSQRelationAccess.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.access; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; @@ -18,7 +19,7 @@ { /** The log that is used in this state. */ private static final Logger log = - Logger.getLogger(StaticSQRelationAccess.class); + LogManager.getLogger(StaticSQRelationAccess.class); private String measurementStation;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/cache/CacheFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/cache/CacheFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,11 +14,12 @@ import net.sf.ehcache.CacheException; import net.sf.ehcache.CacheManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public final class CacheFactory { - private static Logger log = Logger.getLogger(CacheFactory.class); + private static Logger log = LogManager.getLogger(CacheFactory.class); public static final String CACHE_CONFIG_FILE_PROPERTY = "flys.artifacts.cache.config.file";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.context; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -26,7 +27,7 @@ public class RiverContext extends DefaultArtifactContext { /** The log used in this class. */ - private static Logger log = Logger.getLogger(RiverContext.class); + private static Logger log = LogManager.getLogger(RiverContext.class); /** The key that is used to store the StateEngine in the context. */ public static final String ARTIFACT_KEY =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.State; import org.dive4elements.artifactdatabase.state.StateEngine; @@ -65,7 +66,7 @@ public class RiverContextFactory implements ArtifactContextFactory { /** The log that is used in this class. */ - private static Logger log = Logger.getLogger(RiverContextFactory.class); + private static Logger log = LogManager.getLogger(RiverContextFactory.class); /** The XPath to the artifacts configured in the configuration. */ public static final String XPATH_ARTIFACTS =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/SessionCallContextListener.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/SessionCallContextListener.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.context; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -33,7 +34,7 @@ /** The log that is used in this class.*/ private static Logger log = - Logger.getLogger(SessionCallContextListener.class); + LogManager.getLogger(SessionCallContextListener.class); public SessionCallContextListener() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DBConfig.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DBConfig.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,11 +13,12 @@ import org.dive4elements.artifactdatabase.db.SQL; import org.dive4elements.artifactdatabase.db.DBConnection; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class DBConfig { - private static Logger log = Logger.getLogger(DBConfig.class); + private static Logger log = LogManager.getLogger(DBConfig.class); /** * XPath to access the database driver within the global configuration.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java Wed Mar 02 10:26:50 2022 +0100 @@ -40,14 +40,15 @@ import org.dive4elements.artifacts.common.utils.LRUCache; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; public class Datacage implements LifetimeListener { - private static Logger log = Logger.getLogger(Datacage.class); + private static Logger log = LogManager.getLogger(Datacage.class); public static final String DATACAGE_KEY = "global.datacage.instance";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DatacageBackendListener.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DatacageBackendListener.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.dive4elements.artifactdatabase.BackendListener; import org.dive4elements.artifactdatabase.Backend; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -27,7 +28,7 @@ implements BackendListener { private static Logger log = - Logger.getLogger(DatacageBackendListener.class); + LogManager.getLogger(DatacageBackendListener.class); protected GlobalContext context;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Recommendations.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Recommendations.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import java.sql.Connection; import java.sql.SQLException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -59,7 +60,7 @@ public static final String DEFAULT_CONNECTION_NAME = CONNECTION_SYSTEM; - private static Logger log = Logger.getLogger(Recommendations.class); + private static Logger log = LogManager.getLogger(Recommendations.class); private static final boolean DEVELOPMENT_MODE = Boolean.getBoolean("flys.datacage.recommendations.development");
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/App.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/App.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -30,7 +31,7 @@ public class App { - private static Logger log = Logger.getLogger(App.class); + private static Logger log = LogManager.getLogger(App.class); public static final String template = System.getProperty("meta.data.template", "meta-data.xml");
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java Wed Mar 02 10:26:50 2022 +0100 @@ -39,7 +39,8 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -52,7 +53,7 @@ /** Handles and evaluate meta-data template against dbs. */ public class Builder { - private static Logger log = Logger.getLogger(Builder.class); + private static Logger log = LogManager.getLogger(Builder.class); public static final Pattern MAGIC_EXPR_SEPARATOR = Pattern.compile("#!#");
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/BuilderPool.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/BuilderPool.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -29,7 +30,7 @@ */ public class BuilderPool { - private static Logger log = Logger.getLogger(BuilderPool.class); + private static Logger log = LogManager.getLogger(BuilderPool.class); private static final int DEFAULT_POOL_SIZE = 4;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/CompiledStatement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/CompiledStatement.java Wed Mar 02 10:26:50 2022 +0100 @@ -26,12 +26,13 @@ import org.dive4elements.river.artifacts.cache.CacheFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** SQL Statement, create PreparedStatement. */ public class CompiledStatement { - private static Logger log = Logger.getLogger(CompiledStatement.class); + private static Logger log = LogManager.getLogger(CompiledStatement.class); public static final String DATACAGE_DB_CACHE = "datacage.db";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,7 +29,8 @@ import javax.xml.xpath.XPathFunctionException; import javax.xml.xpath.XPathFunctionResolver; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.transition.TransitionEngine; import org.dive4elements.artifacts.GlobalContext; import org.dive4elements.river.artifacts.context.RiverContext; @@ -41,7 +42,7 @@ implements XPathFunctionResolver { /** Home log. */ - private static Logger log = Logger.getLogger(FunctionResolver.class); + private static Logger log = LogManager.getLogger(FunctionResolver.class); public static final String FUNCTION_NAMESPACE_URI = "dc";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/ResultData.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/ResultData.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,14 +17,15 @@ import java.util.List; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Result Data from a DB/SQL query. */ public class ResultData implements Serializable { - private static Logger log = Logger.getLogger(ResultData.class); + private static Logger log = LogManager.getLogger(ResultData.class); protected String [] columns;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/StackFrames.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/StackFrames.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.xml.namespace.QName; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -29,7 +30,7 @@ public class StackFrames implements XPathVariableResolver { - private static Logger log = Logger.getLogger(StackFrames.class); + private static Logger log = LogManager.getLogger(StackFrames.class); public static final Object NULL = new Object() { @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/TypeConverter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/TypeConverter.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,11 +11,12 @@ import java.sql.Date; import java.sql.Timestamp; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class TypeConverter { - private static Logger log = Logger.getLogger(TypeConverter.class); + private static Logger log = LogManager.getLogger(TypeConverter.class); private TypeConverter() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/geom/Lines.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/geom/Lines.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.dive4elements.river.artifacts.math.Linear; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import gnu.trove.TDoubleArrayList; @@ -26,7 +27,7 @@ */ public class Lines { - private static Logger log = Logger.getLogger(Lines.class); + private static Logger log = LogManager.getLogger(Lines.class); public static final double EPSILON = 1e-4;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/map/RiverMapfileGeneratorStarter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/map/RiverMapfileGeneratorStarter.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.dive4elements.artifacts.GlobalContext; import org.dive4elements.river.utils.RiverMapfileGenerator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; /** @@ -23,7 +24,7 @@ */ public class RiverMapfileGeneratorStarter implements LifetimeListener { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( RiverMapfileGeneratorStarter.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/math/BackJumpCorrector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/math/BackJumpCorrector.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.Calculation; @@ -30,7 +31,7 @@ public class BackJumpCorrector implements Serializable { - private static Logger log = Logger.getLogger(BackJumpCorrector.class); + private static Logger log = LogManager.getLogger(BackJumpCorrector.class); protected ArrayList<Double> backjumps;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/math/GrubbsOutlier.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/math/GrubbsOutlier.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.apache.commons.math.stat.descriptive.moment.Mean; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class GrubbsOutlier { @@ -25,7 +26,7 @@ public static final double DEFAULT_ALPHA = 0.05; - private static Logger log = Logger.getLogger(GrubbsOutlier.class); + private static Logger log = LogManager.getLogger(GrubbsOutlier.class); protected GrubbsOutlier() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/math/StdDevOutlier.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/math/StdDevOutlier.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /* XXX: * Warning: This class is called StdDevOutlier because it caculates the @@ -22,7 +23,7 @@ { public static final double DEFAULT_FACTOR = 3; - private static Logger log = Logger.getLogger(StdDevOutlier.class); + private static Logger log = LogManager.getLogger(StdDevOutlier.class); protected StdDevOutlier() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/AreaFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/AreaFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -36,7 +37,7 @@ public class AreaFacet extends DefaultFacet { - private static Logger log = Logger.getLogger(AreaFacet.class); + private static Logger log = LogManager.getLogger(AreaFacet.class); /** * Constructor, set (maybe localized) description and name.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation1.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation1.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,12 +10,13 @@ import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Calculation1 extends Calculation { - private static Logger log = Logger.getLogger(Calculation1.class); + private static Logger log = LogManager.getLogger(Calculation1.class); protected double [] kms; protected double [] qs;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation2.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation2.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,14 +13,15 @@ import java.io.PrintWriter; import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** ComputedDischargeCurve. */ public class Calculation2 extends Calculation { - private static Logger log = Logger.getLogger(Calculation2.class); + private static Logger log = LogManager.getLogger(Calculation2.class); protected double km;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation3.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation3.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,12 +8,13 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Calculation3 extends Calculation { - private static Logger log = Logger.getLogger(Calculation3.class); + private static Logger log = LogManager.getLogger(Calculation3.class); protected double km; protected int [] days;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,12 +25,13 @@ import java.util.Arrays; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Calculation4 extends Calculation { - private static Logger log = Logger.getLogger(Calculation4.class); + private static Logger log = LogManager.getLogger(Calculation4.class); public static final double MINIMAL_STEP_WIDTH = 1e-5;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation5.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation5.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,12 +18,13 @@ import java.util.ArrayList; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Calculation5 extends Calculation { - private static Logger log = Logger.getLogger(Calculation5.class); + private static Logger log = LogManager.getLogger(Calculation5.class); protected double startKm; protected double [] endKms;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.DischargeTable; import org.dive4elements.river.model.Gauge; @@ -31,7 +32,7 @@ */ public class Calculation6 extends Calculation { - private static final Logger log = Logger.getLogger(Calculation6.class); + private static final Logger log = LogManager.getLogger(Calculation6.class); private int mode; private long [] timerange;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -40,7 +41,7 @@ = "crosssection.masterprofile.km.next"; - private static Logger log = Logger.getLogger(CrossSectionFacet.class); + private static Logger log = LogManager.getLogger(CrossSectionFacet.class); protected ComputeType type;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionWaterLineFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionWaterLineFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.List; @@ -34,7 +35,7 @@ /** Private log to use. */ private static Logger log = - Logger.getLogger(CrossSectionWaterLineFacet.class); + LogManager.getLogger(CrossSectionWaterLineFacet.class); /** Trivial constructor, set (maybe localized) description. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -23,7 +24,7 @@ */ public class DifferenceCurveFacet extends WaterlevelFacet { - private static Logger log = Logger.getLogger(DifferenceCurveFacet.class); + private static Logger log = LogManager.getLogger(DifferenceCurveFacet.class); public DifferenceCurveFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DischargeTables.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DischargeTables.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.SessionHolder; import org.dive4elements.river.model.Gauge; @@ -32,7 +33,7 @@ implements Serializable { /** Private log. */ - private static Logger log = Logger.getLogger(DischargeTables.class); + private static Logger log = LogManager.getLogger(DischargeTables.class); public static final int MASTER = 0;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DurationCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DurationCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.List; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -30,7 +31,7 @@ */ public class DurationCurveFacet extends DefaultFacet { - private static Logger log = Logger.getLogger(DurationCurveFacet.class); + private static Logger log = LogManager.getLogger(DurationCurveFacet.class); /** Blackboard data provider key for durationcurve (wqday) data. */ public static String BB_DURATIONCURVE = "durationcurve";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.dive4elements.river.model.FastCrossSectionLine; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Number of FastCrossSectionLines, e.g. to store in cache and retrieve @@ -26,7 +27,7 @@ public class FastCrossSectionChunk implements Serializable { - private static Logger log = Logger.getLogger(FastCrossSectionChunk.class); + private static Logger log = LogManager.getLogger(FastCrossSectionChunk.class); public static final String PREFIX = "FCSC:"; public static final double KM_RANGE = 1.0;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionLineFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionLineFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,12 +19,13 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class FastCrossSectionLineFactory { private static Logger log = - Logger.getLogger(FastCrossSectionLineFactory.class); + LogManager.getLogger(FastCrossSectionLineFactory.class); public static final String CACHE_NAME = "fast-cross-section-lines";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsColumnFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsColumnFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,11 +24,12 @@ import org.hibernate.type.StandardBasicTypes; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class FixingsColumnFactory { - private static Logger log = Logger.getLogger(FixingsColumnFactory.class); + private static Logger log = LogManager.getLogger(FixingsColumnFactory.class); public static final String CACHE_NAME = "fixings-columns";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsFilterBuilder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsFilterBuilder.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,7 +29,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -38,7 +39,7 @@ public class FixingsFilterBuilder { - private static Logger log = Logger.getLogger(FixingsFilterBuilder.class); + private static Logger log = LogManager.getLogger(FixingsFilterBuilder.class); protected Filter filter; protected Range range;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverview.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverview.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -35,7 +36,7 @@ public class FixingsOverview implements Serializable { - private static Logger log = Logger.getLogger(FixingsOverview.class); + private static Logger log = LogManager.getLogger(FixingsOverview.class); public static final double EPSILON = 1e-2;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverviewFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverviewFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,13 +15,14 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; public class FixingsOverviewFactory { - private static Logger log = Logger.getLogger(FixingsOverviewFactory.class); + private static Logger log = LogManager.getLogger(FixingsOverviewFactory.class); public static final String CACHE_NAME = "fixings-overviews";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.util.Collections; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Calculate flow velocity. */ @@ -28,7 +29,7 @@ /** Own log. */ private static final Logger log = - Logger.getLogger(FlowVelocityCalculation.class); + LogManager.getLogger(FlowVelocityCalculation.class); public CalculationResult calculate(FlowVelocityAccess access) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,14 +17,15 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet of a FlowVelocity curve. */ public class FlowVelocityFacet extends DataFacet { - private static Logger log = Logger.getLogger(FlowVelocityFacet.class); + private static Logger log = LogManager.getLogger(FlowVelocityFacet.class); public FlowVelocityFacet() { // required for clone operation deepCopy()
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityFilterFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FlowVelocityFilterFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,14 +21,15 @@ import org.dive4elements.river.artifacts.math.MovingAverage; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet of a FlowVelocity curve. */ public class FlowVelocityFilterFacet extends DataFacet { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( FlowVelocityFilterFacet.class); public FlowVelocityFilterFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeDischargeCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeDischargeCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.dive4elements.river.utils.RiverUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import static org.dive4elements.river.exports.injector.InjectorConstants.PNP; @@ -36,7 +37,7 @@ implements FacetTypes { private static final Logger log = - Logger.getLogger(GaugeDischargeCurveFacet.class); + LogManager.getLogger(GaugeDischargeCurveFacet.class); public GaugeDischargeCurveFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeDischargeFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeDischargeFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -26,7 +27,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(GaugeDischargeFacet.class); + LogManager.getLogger(GaugeDischargeFacet.class); public GaugeDischargeFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeFinder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeFinder.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -23,7 +24,7 @@ public class GaugeFinder implements Serializable { - private static Logger log = Logger.getLogger(GaugeFinder.class); + private static Logger log = LogManager.getLogger(GaugeFinder.class); public static final String SQL_DISCHARGE_SECTORS = "SELECT" +
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeFinderFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeFinderFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -30,7 +31,7 @@ /** Get GaugeFinders. */ public class GaugeFinderFactory { - private static Logger log = Logger.getLogger(GaugeFinderFactory.class); + private static Logger log = LogManager.getLogger(GaugeFinderFactory.class); public static final String CACHE_NAME = "gauge-finders";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeRange.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeRange.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Gauge, km-range, main values. @@ -23,7 +24,7 @@ public class GaugeRange extends Range { - private static Logger log = Logger.getLogger(GaugeRange.class); + private static Logger log = LogManager.getLogger(GaugeRange.class); private static final class Sector implements Serializable {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HYKFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HYKFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -29,7 +30,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(HYKFacet.class); + private static Logger log = LogManager.getLogger(HYKFacet.class); /** Trivial constructor, set (maybe localized) description. */ public HYKFacet(int idx, String description) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HYKFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HYKFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -33,7 +34,7 @@ */ public class HYKFactory { - private static Logger log = Logger.getLogger(HYKFactory.class); + private static Logger log = LogManager.getLogger(HYKFactory.class); public static String HYK_CACHE_NAME = "hykache";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeDifferenceFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeDifferenceFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ extends HistoricalDischargeFacet { private static final Logger log = - Logger.getLogger(HistoricalDischargeDifferenceFacet.class); + LogManager.getLogger(HistoricalDischargeDifferenceFacet.class); public HistoricalDischargeDifferenceFacet(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ public class HistoricalDischargeFacet extends DataFacet { private static final Logger log = - Logger.getLogger(HistoricalDischargeFacet.class); + LogManager.getLogger(HistoricalDischargeFacet.class); public HistoricalDischargeFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeWQFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/HistoricalDischargeWQFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import static org.dive4elements.river.exports.injector.InjectorConstants.PNP; @@ -23,7 +24,7 @@ public class HistoricalDischargeWQFacet extends DataFacet implements FacetTypes { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(HistoricalDischargeWQFacet.class); private double value;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LocationProvider.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LocationProvider.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.Annotation; import org.dive4elements.river.model.FastAnnotations; @@ -23,7 +24,7 @@ public class LocationProvider { private static final Logger log = - Logger.getLogger(LocationProvider.class); + LogManager.getLogger(LocationProvider.class); public static final String CACHE_KEY = "location-provider";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesQFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesQFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -39,7 +40,7 @@ implements FacetTypes { /** Own log. */ - private static Logger log = Logger.getLogger(MainValuesQFacet.class); + private static Logger log = LogManager.getLogger(MainValuesQFacet.class); /** Trivial Constructor. */ public MainValuesQFacet(String name, String description) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -34,7 +35,7 @@ implements FacetTypes { /** Own log. */ - private static Logger log = Logger.getLogger(MainValuesWFacet.class); + private static Logger log = LogManager.getLogger(MainValuesWFacet.class); /** Trivial Constructor. */ public MainValuesWFacet(String name, String description) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManagedFacetAdapter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManagedFacetAdapter.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -30,7 +31,7 @@ } - protected Logger log = Logger.getLogger(ManagedFacetAdapter.class); + protected Logger log = LogManager.getLogger(ManagedFacetAdapter.class); public ManagedFacetAdapter( Facet facet,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManualPointsFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManualPointsFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -26,7 +27,7 @@ extends DefaultFacet { /** Logger for this class. */ - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( ManualPointsFacet.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.cache.CacheFactory; import org.dive4elements.river.model.Gauge; @@ -34,7 +35,7 @@ { public static final String CACHE_NAME = "official-lines"; - private static Logger log = Logger.getLogger(OfficialLineFinder.class); + private static Logger log = LogManager.getLogger(OfficialLineFinder.class); // We will only have one entry in this cache. public static final String CACHE_KEY = CACHE_NAME;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Parameters.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Parameters.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,12 +16,13 @@ import java.io.Serializable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Parameters implements Serializable { - private static Logger log = Logger.getLogger(Parameters.class); + private static Logger log = LogManager.getLogger(Parameters.class); public interface Visitor {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QRangeTree.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QRangeTree.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,12 +13,13 @@ import java.util.List; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class QRangeTree implements Serializable { - private static Logger log = Logger.getLogger(QRangeTree.class); + private static Logger log = LogManager.getLogger(QRangeTree.class); public static final double EPSILON = 1e-4;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QSectorFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QSectorFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -28,7 +29,7 @@ extends DefaultFacet { /** Logger for this class. */ - private static final Logger log = Logger.getLogger(QSectorFacet.class); + private static final Logger log = LogManager.getLogger(QSectorFacet.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ReferenceCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ReferenceCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,14 +21,15 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Facet for W-over-Ws. */ public class ReferenceCurveFacet extends DataFacet { - private static Logger log = Logger.getLogger(ReferenceCurveFacet.class); + private static Logger log = LogManager.getLogger(ReferenceCurveFacet.class); public static final String CONTEXT_KEY = "reference.curve.axis.scale";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/RelativePointFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/RelativePointFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.List; import java.awt.geom.Point2D; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -29,7 +30,7 @@ implements FacetTypes { /** Own log. */ - private static Logger log = Logger.getLogger(RelativePointFacet.class); + private static Logger log = LogManager.getLogger(RelativePointFacet.class); /** Trivial Constructor. */ public RelativePointFacet(String description) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ReportFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ReportFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,13 +19,14 @@ import org.dive4elements.river.artifacts.D4EArtifact; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ReportFacet extends DefaultFacet implements FacetTypes { - private static Logger log = Logger.getLogger(ReportFacet.class); + private static Logger log = LogManager.getLogger(ReportFacet.class); protected ComputeType type; protected String hash;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/SQOverview.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/SQOverview.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -31,7 +32,7 @@ public class SQOverview implements Serializable { - private static Logger log = Logger.getLogger(SQOverview.class); + private static Logger log = LogManager.getLogger(SQOverview.class); /** * Serial version UId.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/SQOverviewFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/SQOverviewFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,13 +15,14 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; public class SQOverviewFactory { - private static Logger log = Logger.getLogger(SQOverviewFactory.class); + private static Logger log = LogManager.getLogger(SQOverviewFactory.class); public static final String CACHE_NAME = "sq-overviews";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Segment.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Segment.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,13 +21,14 @@ import java.util.Comparator; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** A Range with values and a reference point. */ public class Segment implements Serializable { - private static Logger log = Logger.getLogger(Segment.class); + private static Logger log = LogManager.getLogger(Segment.class); public static final Comparator<Segment> REF_CMP = new Comparator<Segment>() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/W.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/W.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,12 +13,13 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class W extends NamedObjectImpl { - private static Logger log = Logger.getLogger(W.class); + private static Logger log = LogManager.getLogger(W.class); protected TDoubleArrayList ws;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; @@ -32,7 +33,7 @@ public class WKmsFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger(WKmsFactory.class); + private static Logger log = LogManager.getLogger(WKmsFactory.class); /** Query to get km and ws for wst_id and column_pos. */ public static final String SQL_SELECT_WS =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsJRDataSource.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsJRDataSource.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; @@ -24,7 +25,7 @@ public class WKmsJRDataSource implements JRDataSource { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(WKmsJRDataSource.class); + private static Logger log = LogManager.getLogger(WKmsJRDataSource.class); /** *
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQ.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQ.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class WQ extends W @@ -25,7 +26,7 @@ public static final Pattern NUMBERS_PATTERN = Pattern.compile("\\D*(\\d++.\\d*)\\D*"); - private static Logger log = Logger.getLogger(WQ.class); + private static Logger log = LogManager.getLogger(WQ.class); protected TDoubleArrayList qs;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -26,7 +27,7 @@ extends WQ implements WKms, QKms { - private static Logger log = Logger.getLogger(WQKms.class); + private static Logger log = LogManager.getLogger(WQKms.class); /** The array that contains the 'KMs' values. */ protected TDoubleArrayList kms;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -30,7 +31,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(WQKmsFacet.class); + private static Logger log = LogManager.getLogger(WQKmsFacet.class); /** Trivial Constructor. */ public WQKmsFacet(String description) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; @@ -30,7 +31,7 @@ */ public class WQKmsFactory { - private static Logger log = Logger.getLogger(WQKmsFactory.class); + private static Logger log = LogManager.getLogger(WQKmsFactory.class); /** Query to get km and wqs for wst_id and column_pos. */ public static final String SQL_SELECT_WQS =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQTJRDataSource.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQTJRDataSource.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; @@ -24,7 +25,7 @@ public class WQTJRDataSource implements JRDataSource { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(WQTJRDataSource.class); + private static Logger log = LogManager.getLogger(WQTJRDataSource.class); /** *
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WWQQJRDataSource.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WWQQJRDataSource.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; @@ -24,7 +25,7 @@ public class WWQQJRDataSource implements JRDataSource { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(WWQQJRDataSource.class); + private static Logger log = LogManager.getLogger(WWQQJRDataSource.class); /** *
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WaterlevelFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WaterlevelFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,14 +16,15 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; import org.dive4elements.river.artifacts.model.extreme.ExtremeResult; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet of a Waterlevel (WQKms). */ public class WaterlevelFacet extends DataFacet { - private static Logger log = Logger.getLogger(WaterlevelFacet.class); + private static Logger log = LogManager.getLogger(WaterlevelFacet.class); public WaterlevelFacet(int index, String name, String description) { super(index, name, description, ComputeType.ADVANCE, null, null);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTable.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTable.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import java.util.List; import java.util.Collections; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.commons.math.analysis.interpolation.SplineInterpolator; @@ -39,7 +40,7 @@ public class WstValueTable implements Serializable { - private static Logger log = Logger.getLogger(WstValueTable.class); + private static Logger log = LogManager.getLogger(WstValueTable.class); public static final int DEFAULT_Q_STEPS = 500;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTableFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTableFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.dive4elements.river.backend.SessionHolder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.River; import org.dive4elements.river.model.Wst; @@ -36,7 +37,7 @@ */ public class WstValueTableFactory { - private static Logger log = Logger.getLogger(WstValueTableFactory.class); + private static Logger log = LogManager.getLogger(WstValueTableFactory.class); public static final int DEFAULT_KIND = 0;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ZoomScale.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ZoomScale.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.math.Linear; @@ -21,7 +22,7 @@ /** Has to do with adaptive smoothing based on current diagram extent. */ public class ZoomScale { - private static Logger log = Logger.getLogger(ZoomScale.class); + private static Logger log = LogManager.getLogger(ZoomScale.class); private HashMap<String, TreeMap<Double, Double>> rivers;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/extreme/Curve.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/extreme/Curve.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,13 +22,14 @@ import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** An extrapolating W/Q function/curve. */ public class Curve implements Serializable, Function { - private static Logger log = Logger.getLogger(Curve.class); + private static Logger log = LogManager.getLogger(Curve.class); protected double [] qs; protected double [] ws;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/extreme/ExtremeCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/extreme/ExtremeCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import org.dive4elements.river.utils.KMIndex; import org.dive4elements.river.utils.DoubleUtil; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show the W|Q values. @@ -34,7 +35,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(ExtremeCurveFacet.class); + private static Logger log = LogManager.getLogger(ExtremeCurveFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/Fitting.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/Fitting.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,14 +17,15 @@ import org.apache.commons.math.optimization.fitting.CurveFitter; import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.math.GrubbsOutlier; import org.dive4elements.river.artifacts.math.fitting.Function; public class Fitting { - private static Logger log = Logger.getLogger(Fitting.class); + private static Logger log = LogManager.getLogger(Fitting.class); /** Use instance of this factory to find meta infos for outliers. */ public interface QWDFactory {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -40,12 +40,13 @@ import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class FixAnalysisCalculation extends FixCalculation { - private static Logger log = Logger.getLogger(FixAnalysisCalculation.class); + private static Logger log = LogManager.getLogger(FixAnalysisCalculation.class); protected DateRange referencePeriod; protected DateRange [] analysisPeriods;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisEventsFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisEventsFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import org.dive4elements.river.utils.KMIndex; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show W values for Q values at km for a date. @@ -32,7 +33,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixAnalysisEventsFacet.class); + private static Logger log = LogManager.getLogger(FixAnalysisEventsFacet.class); /** Trivial Constructor. */ public FixAnalysisEventsFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.dive4elements.river.utils.KMIndex; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show W values for Q values at km for a date. @@ -33,7 +34,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixAnalysisPeriodsFacet.class); + private static Logger log = LogManager.getLogger(FixAnalysisPeriodsFacet.class); /** Trivial Constructor. */ public FixAnalysisPeriodsFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisResult.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisResult.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.TreeMap; import java.util.TreeSet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.Parameters; import org.dive4elements.river.utils.KMIndex; @@ -24,7 +25,7 @@ extends FixResult { private static Logger log = - Logger.getLogger(FixAnalysisResult.class); + LogManager.getLogger(FixAnalysisResult.class); protected KMIndex<AnalysisPeriod []> analysisPeriods;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAvSectorFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAvSectorFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.dive4elements.river.utils.KMIndex; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -35,7 +36,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixAvSectorFacet.class); + private static Logger log = LogManager.getLogger(FixAvSectorFacet.class); /** Trivial Constructor. */ public FixAvSectorFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -38,13 +38,14 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Calculation base class for fix. */ public abstract class FixCalculation extends Calculation { - private static Logger log = Logger.getLogger(FixCalculation.class); + private static Logger log = LogManager.getLogger(FixCalculation.class); public static final double EPSILON = 1e-4;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixDerivateFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixDerivateFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -37,7 +38,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixDerivateFacet.class); + private static Logger log = LogManager.getLogger(FixDerivateFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixDeviationFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixDeviationFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -32,7 +33,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixDeviationFacet.class); + private static Logger log = LogManager.getLogger(FixDeviationFacet.class); public static final String [] STD_DEV_COLUMN = { "std-dev" };
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -29,7 +30,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( FixLongitudinalAnalysisFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAvSectorFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAvSectorFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ /** House log. */ private static Logger log = - Logger.getLogger(FixLongitudinalAvSectorFacet.class); + LogManager.getLogger(FixLongitudinalAvSectorFacet.class); /** Trivial Constructor. */ public FixLongitudinalAvSectorFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.dive4elements.river.utils.KMIndex; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show average W values for Q sectors. @@ -34,7 +35,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( FixLongitudinalDeviationFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.dive4elements.river.utils.KMIndex; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -34,7 +35,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( FixLongitudinalReferenceFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixOutlierFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixOutlierFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -28,7 +29,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixOutlierFacet.class); + private static Logger log = LogManager.getLogger(FixOutlierFacet.class); /** Trivial Constructor. */ public FixOutlierFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,14 +23,15 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Calculation for FixRealize (german: ausgel. WSPL). */ public class FixRealizingCalculation extends FixCalculation { private static Logger log = - Logger.getLogger(FixRealizingCalculation.class); + LogManager.getLogger(FixRealizingCalculation.class); protected boolean isQ; protected List<Segment> segments;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -29,7 +30,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixReferenceEventsFacet.class); + private static Logger log = LogManager.getLogger(FixReferenceEventsFacet.class); /** Trivial Constructor. */ public FixReferenceEventsFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixResult.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixResult.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.Parameters; import org.dive4elements.river.utils.KMIndex; @@ -23,7 +24,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(FixResult.class); + LogManager.getLogger(FixResult.class); protected Parameters parameters; protected KMIndex<QWD []> referenced;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixWQCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixWQCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show the W|Q values. @@ -36,7 +37,7 @@ implements FacetTypes { /** House log. */ - private static Logger log = Logger.getLogger(FixWQCurveFacet.class); + private static Logger log = LogManager.getLogger(FixWQCurveFacet.class); /** Trivial Constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/RankRemapper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/RankRemapper.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,13 +10,14 @@ import java.util.IdentityHashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import gnu.trove.TIntIntHashMap; public class RankRemapper { - private static Logger log = Logger.getLogger(RankRemapper.class); + private static Logger log = LogManager.getLogger(RankRemapper.class); private TIntIntHashMap index2rank; private IdentityHashMap<QWI, Boolean> visited;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/HWSContainer.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/HWSContainer.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,11 +11,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class HWSContainer { - private static Logger log = Logger.getLogger(HWSContainer.class); + private static Logger log = LogManager.getLogger(HWSContainer.class); private String river; private HWS.TYPE type; private List<HWS> hws;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/HWSFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/HWSFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -28,7 +29,7 @@ public class HWSFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger(HWSFactory.class); + private static Logger log = LogManager.getLogger(HWSFactory.class); private static final int HWS_LINES = 0; private static final int HWS_POINTS = 1;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/ShapeFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/ShapeFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.io.File; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.DefaultFacet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -21,7 +22,7 @@ public class ShapeFacet extends DefaultFacet { - private static Logger log = Logger.getLogger(ShapeFacet.class); + private static Logger log = LogManager.getLogger(ShapeFacet.class); private static final String BASE_DIR = "/artifact-database/floodmap/shapefile-path/@value";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WMSLayerFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WMSLayerFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -41,7 +42,7 @@ protected String srid; - private static final Logger log = Logger.getLogger(WMSLayerFacet.class); + private static final Logger log = LogManager.getLogger(WMSLayerFacet.class); public WMSLayerFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.model.Calculation; @@ -22,7 +23,7 @@ public class WSPLGENCalculation extends Calculation { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( WSPLGENCalculation.class); protected Map<Integer, String> errors;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENJob.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENJob.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ public class WSPLGENJob { - private static Logger log = Logger.getLogger(WSPLGENJob.class); + private static Logger log = LogManager.getLogger(WSPLGENJob.class); public static final String GEL_SPERRE = "SPERRE"; public static final String GEL_NOSPERRE = "NOSPERRE";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENReportFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/WSPLGENReportFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ */ public class WSPLGENReportFacet extends ReportFacet { - private static Logger log = Logger.getLogger(WSPLGENReportFacet.class); + private static Logger log = LogManager.getLogger(WSPLGENReportFacet.class); protected CalculationResult result;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiameterDataFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiameterDataFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -22,7 +23,7 @@ public class BedDiameterDataFacet extends DataFacet { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( BedDiameterDataFacet.class); public BedDiameterDataFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -9,7 +9,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.access.BedDifferencesAccess; @@ -24,7 +25,7 @@ extends Calculation { private static final Logger log = - Logger.getLogger(BedDiffCalculation.class); + LogManager.getLogger(BedDiffCalculation.class); protected String river; protected int [][] heightIds;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -22,7 +23,7 @@ public class BedDiffFacet extends DataFacet { - private static Logger log = Logger.getLogger(BedDiffFacet.class); + private static Logger log = LogManager.getLogger(BedDiffFacet.class); public BedDiffFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFilterFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFilterFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -30,7 +31,7 @@ public class BedDiffFilterFacet extends DataFacet { - private static Logger log = Logger.getLogger(BedDiffFilterFacet.class); + private static Logger log = LogManager.getLogger(BedDiffFilterFacet.class); public BedDiffFilterFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -28,7 +29,7 @@ extends DataFacet implements FacetTypes { - private static Logger log = Logger.getLogger(BedDiffHeightMinFacet.class); + private static Logger log = LogManager.getLogger(BedDiffHeightMinFacet.class); public BedDiffHeightMinFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -32,7 +33,7 @@ public class BedDiffHeightMinFilterFacet extends DataFacet { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedDiffHeightMinFilterFacet.class); public BedDiffHeightMinFilterFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -28,7 +29,7 @@ extends DataFacet implements FacetTypes { - private static Logger log = Logger.getLogger(BedDiffHeightSubFacet.class); + private static Logger log = LogManager.getLogger(BedDiffHeightSubFacet.class); public BedDiffHeightSubFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -32,7 +33,7 @@ public class BedDiffHeightSubFilterFacet extends DataFacet { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedDiffHeightSubFilterFacet.class); public BedDiffHeightSubFilterFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -23,7 +24,7 @@ extends DataFacet implements FacetTypes { - private static Logger log = Logger.getLogger(BedDiffPerYearFacet.class); + private static Logger log = LogManager.getLogger(BedDiffPerYearFacet.class); public BedDiffPerYearFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFilterFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFilterFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -30,7 +31,7 @@ public class BedDiffPerYearFilterFacet extends DataFacet { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedDiffPerYearFilterFacet.class); public BedDiffPerYearFilterFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import gnu.trove.TDoubleArrayList; import org.dive4elements.river.artifacts.model.NamedObjectImpl; @@ -16,7 +17,7 @@ public class BedHeightData extends NamedObjectImpl { - private static Logger log = Logger.getLogger(BedHeightData.class); + private static Logger log = LogManager.getLogger(BedHeightData.class); protected TDoubleArrayList heights; protected TDoubleArrayList station;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; @@ -25,7 +26,7 @@ extends BlackboardDataFacet implements FacetTypes { - private static final Logger log = Logger.getLogger(BedHeightFacet.class); + private static final Logger log = LogManager.getLogger(BedHeightFacet.class); public BedHeightFacet(String name, String description) { this.name = name;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -26,7 +27,7 @@ /** Create BedHeights from database. */ public class BedHeightFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger(BedHeightFactory.class); + private static Logger log = LogManager.getLogger(BedHeightFactory.class); /** Query to get km and ws for wst_id and column_pos. */ public static final String SQL_SELECT_SINGLE =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -79,7 +80,7 @@ } }; - private static Logger log = Logger.getLogger(BedOverview.class); + private static Logger log = LogManager.getLogger(BedOverview.class); public static final double EPSILON = 1e-4;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverviewFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverviewFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.dive4elements.river.artifacts.cache.CacheFactory; @@ -19,7 +20,7 @@ public class BedOverviewFactory { - private static Logger log = Logger.getLogger(BedOverviewFactory.class); + private static Logger log = LogManager.getLogger(BedOverviewFactory.class); public static final String CACHE_NAME = "sq-overviews";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.access.BedQualityAccess; import org.dive4elements.river.artifacts.model.Calculation; @@ -25,7 +26,7 @@ public class BedQualityCalculation extends Calculation { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(BedQualityCalculation.class); protected String river;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityDataFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityDataFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -26,7 +27,7 @@ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BedQualityDataFacet.class); + private static Logger log = LogManager.getLogger(BedQualityDataFacet.class); private String valueName; /* Name of ResultValue underlying this facet */ private String valueType; /* Type of ResultValue underlying this facet */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityInterpolFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityInterpolFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -27,7 +28,7 @@ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedQualityInterpolFacet.class); private String valueName; /* Name of ResultValue underlying this facet */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadDiameterDataFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadDiameterDataFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -23,7 +24,7 @@ public class BedloadDiameterDataFacet extends DataFacet { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( BedloadDiameterDataFacet.class); public BedloadDiameterDataFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadOverview.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadOverview.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -26,7 +27,7 @@ public class BedloadOverview implements Serializable { - private static Logger log = Logger.getLogger(BedloadOverview.class); + private static Logger log = LogManager.getLogger(BedloadOverview.class); /** * Serial version UId.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadOverviewFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedloadOverviewFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.dive4elements.river.artifacts.cache.CacheFactory; @@ -19,7 +20,7 @@ public class BedloadOverviewFactory { - private static Logger log = Logger.getLogger(BedloadOverviewFactory.class); + private static Logger log = LogManager.getLogger(BedloadOverviewFactory.class); public static final String CACHE_NAME = "sq-overviews";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/FlowVelocityMeasurementFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/FlowVelocityMeasurementFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -24,7 +25,7 @@ public class FlowVelocityMeasurementFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( FlowVelocityMeasurementFactory.class); /** Query to get description and start year, given name and a km range. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.river.model.BedHeight; @@ -24,7 +25,7 @@ public class MiddleBedHeightCalculation extends Calculation { private static final Logger log = - Logger.getLogger(MiddleBedHeightCalculation.class); + LogManager.getLogger(MiddleBedHeightCalculation.class); public CalculationResult calculate(BedHeightAccess access) {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,14 +18,15 @@ import org.dive4elements.river.artifacts.resources.Resources; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class MiddleBedHeightData implements Serializable, Comparable<MiddleBedHeightData> { /** Very private log. */ - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( MiddleBedHeightData.class); public static final String I18N_SINGLE_NAME =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.dive4elements.river.artifacts.model.DataFacet; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -27,7 +28,7 @@ */ public class MiddleBedHeightFacet extends DataFacet { - private static Logger log = Logger.getLogger(MiddleBedHeightFacet.class); + private static Logger log = LogManager.getLogger(MiddleBedHeightFacet.class); public MiddleBedHeightFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MorphologicWidthFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MorphologicWidthFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; @@ -23,7 +24,7 @@ extends DataFacet implements FacetTypes { - private static Logger log = Logger.getLogger(MorphologicWidthFacet.class); + private static Logger log = LogManager.getLogger(MorphologicWidthFacet.class); public MorphologicWidthFacet() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MorphologicWidthFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MorphologicWidthFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -26,7 +27,7 @@ public class MorphologicWidthFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( MorphologicWidthFactory.class); public static final String SQL_SELECT =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.StaticFacet; @@ -28,7 +29,7 @@ extends DataFacet implements FacetTypes, StaticFacet { - private static Logger log = Logger.getLogger(PorosityFacet.class); + private static Logger log = LogManager.getLogger(PorosityFacet.class); private static final String NAME = "porosity";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -26,7 +27,7 @@ public class PorosityFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger(PorosityFactory.class); + private static Logger log = LogManager.getLogger(PorosityFactory.class); public static final String SQL_SELECT = "SELECT pv.station AS station, pv.porosity AS porosity " +
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurement.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,11 +11,12 @@ import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** A measurement of the bed quality, serving different diameter at given km. */ public class QualityMeasurement { - private static Logger log = Logger.getLogger(QualityMeasurement.class); + private static Logger log = LogManager.getLogger(QualityMeasurement.class); private double km; private Date date;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurementFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurementFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.transform.BasicTransformerAdapter; @@ -24,7 +25,7 @@ public class QualityMeasurementFactory { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( QualityMeasurementFactory.class); private static final String SQL_BED_MEASUREMENT =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurements.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurements.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,10 +11,11 @@ import java.util.LinkedList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class QualityMeasurements { - private static Logger log = Logger.getLogger(QualityMeasurements.class); + private static Logger log = LogManager.getLogger(QualityMeasurements.class); private List<QualityMeasurement> measurements; public QualityMeasurements() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,14 +18,15 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.Config; /** Sediment Densities for multiple years. */ public class SedimentDensity implements Serializable { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(SedimentDensity.class); public static final double DEFAULT_SEDIMNET_DENSITY_FACTOR = 1.9;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensityFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensityFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Facet to access sediment density values measured in one year. */ @@ -27,7 +28,7 @@ extends DataFacet { /** Very own log. */ - private static Logger log = Logger.getLogger(SedimentDensityFacet.class); + private static Logger log = LogManager.getLogger(SedimentDensityFacet.class); /** Used as tolerance value when fetching measurement stations. */ private static double EPSILON = 1e-5;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensityFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensityFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -25,7 +26,7 @@ public class SedimentDensityFactory { /** Private log to use here. */ - private static Logger log = Logger.getLogger(SedimentDensityFactory.class); + private static Logger log = LogManager.getLogger(SedimentDensityFactory.class); private static final String DENSITY_CACHE_NAME = "sedimentdensity";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,13 +17,14 @@ import java.util.TreeMap; import java.util.TreeSet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.utils.EpsilonComparator; public class SedimentLoadData implements Serializable { - private static Logger log = Logger.getLogger(SedimentLoadData.class); + private static Logger log = LogManager.getLogger(SedimentLoadData.class); public static final int GF_UNKNOWN = -1; public static final int GF_COARSE = 0;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.dive4elements.river.artifacts.access.SedimentLoadAccess; import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.CalculationResult; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Value; import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Station; import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.And; @@ -28,7 +29,7 @@ public class SedimentLoadDataCalculation extends Calculation { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(SedimentLoadDataCalculation.class); public static final int [] TOTAL_LOAD = {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -35,7 +35,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Facet to access various sediment loads. */ @@ -43,7 +44,7 @@ extends DataFacet { /** Very own log. */ - private static Logger log = Logger.getLogger(SedimentLoadDataFacet.class); + private static Logger log = LogManager.getLogger(SedimentLoadDataFacet.class); private static final String BASE_NAME = "sedimentload";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.RiverFactory; import org.dive4elements.river.artifacts.cache.CacheFactory; import org.dive4elements.river.backend.SessionHolder; @@ -24,7 +25,7 @@ public class SedimentLoadDataFactory { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( SedimentLoadDataFactory.class); public static final String CACHE_NAME = "sediment-load-data";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,7 +25,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -35,7 +36,7 @@ extends DataFacet implements StaticFacet { - private static Logger log = Logger.getLogger(SedimentLoadFacet.class); + private static Logger log = LogManager.getLogger(SedimentLoadFacet.class); private static final String NAME = "sedimentload.ta";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSData.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSData.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.dive4elements.river.artifacts.model.Range; import org.dive4elements.river.backend.utils.EpsilonComparator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Gives access to Fractions (at kms). */ @@ -25,7 +26,7 @@ extends NamedObjectImpl { /** Private log. */ - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(SedimentLoadLSData.class); protected String description;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,7 +27,8 @@ import org.dive4elements.river.model.SedimentLoadLS; import org.dive4elements.river.model.SedimentLoadLSValue; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -43,7 +44,7 @@ extends DataFacet implements StaticFacet { - private static Logger log = Logger.getLogger(SedimentLoadLSFacet.class); + private static Logger log = LogManager.getLogger(SedimentLoadLSFacet.class); /* Aheinecke we probably need to get the kind and split this up here * in some way */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadResult.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadResult.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,14 +13,15 @@ import java.io.Serializable; import java.util.Set; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Result from a SedimentLoadCalculation. */ public class SedimentLoadResult implements Serializable { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(SedimentLoadResult.class); protected int startYear; protected int endYear;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Fitting.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Fitting.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer; import org.apache.commons.math.stat.regression.SimpleRegression; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Fitting implements Outlier.Callback @@ -30,7 +31,7 @@ private static final boolean USE_NON_LINEAR_FITTING = Boolean.getBoolean("minfo.sq.fitting.nonlinear"); - private static Logger log = Logger.getLogger(Fitting.class); + private static Logger log = LogManager.getLogger(Fitting.class); public interface Callback {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,11 +12,12 @@ import java.util.Map; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Measurement { - private static final Logger log = Logger.getLogger(Measurement.class); + private static final Logger log = LogManager.getLogger(Measurement.class); public static final double LOG_10_8 = Math.log(10) - Math.log(8); public static final double SCALE_8 = Math.log(10) - Math.log(6.3);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -39,7 +40,7 @@ public class MeasurementFactory { private static final Logger log = - Logger.getLogger(MeasurementFactory.class); + LogManager.getLogger(MeasurementFactory.class); public static final String MINFO_DUMP_SQ_SEDDB_PREFIX = "minfo.dump.sq.seddb.prefix";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,11 +11,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Measurements { - private static final Logger log = Logger.getLogger(Measurements.class); + private static final Logger log = LogManager.getLogger(Measurements.class); public interface SExtractor { double getS(Measurement measument);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Outlier.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Outlier.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,11 +16,12 @@ import org.apache.commons.math.MathException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Outlier { - private static Logger log = Logger.getLogger(Outlier.class); + private static Logger log = LogManager.getLogger(Outlier.class); private static final String GRUBBS = "outlier.method.grubbs";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.sq; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.List; @@ -35,7 +36,7 @@ */ public class SQCurveFacet extends DataFacet implements FacetTypes { - private static final Logger log = Logger.getLogger(SQCurveFacet.class); + private static final Logger log = LogManager.getLogger(SQCurveFacet.class); public static final String FUNCTION = "sq-pow";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.model.sq; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; @@ -29,7 +30,7 @@ */ public class SQMeasurementFacet extends DataFacet implements FacetTypes { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( SQMeasurementFacet.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementsJRDataSource.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementsJRDataSource.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; @@ -23,7 +24,7 @@ public class SQMeasurementsJRDataSource implements JRDataSource { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( SQMeasurementsJRDataSource.class); private ArrayList<String[]> data;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierCurveFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierCurveFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,14 +25,15 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SQOutlierCurveFacet extends DataFacet implements FacetTypes { private static final Logger log = - Logger.getLogger(SQOutlierCurveFacet.class); + LogManager.getLogger(SQOutlierCurveFacet.class); public static final String FUNCTION = "sq-pow";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Facet to show the outliers in a sq relation. @@ -30,7 +31,7 @@ */ public class SQOutlierFacet extends DataFacet implements FacetTypes { - private static final Logger log = Logger.getLogger(SQOutlierFacet.class); + private static final Logger log = LogManager.getLogger(SQOutlierFacet.class); public static final int BITMASK_ITERATION = (1 << 16) - 1;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierMeasurementFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierMeasurementFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,14 +21,15 @@ import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SQOutlierMeasurementFacet extends DataFacet implements FacetTypes { private static final Logger log = - Logger.getLogger(SQOutlierMeasurementFacet.class); + LogManager.getLogger(SQOutlierMeasurementFacet.class); private int fractionIdx;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,12 +25,13 @@ import java.util.Arrays; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SQRelationCalculation extends Calculation { private static final Logger log = - Logger.getLogger(SQRelationCalculation.class); + LogManager.getLogger(SQRelationCalculation.class); public static final boolean NON_LINEAR_FITTING = Boolean.getBoolean("minfo.sq.calcution.non.linear.fitting");
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationJRDataSource.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationJRDataSource.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; @@ -24,7 +25,7 @@ public class SQRelationJRDataSource implements JRDataSource { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(SQRelationJRDataSource.class); + private static Logger log = LogManager.getLogger(SQRelationJRDataSource.class); private ArrayList<String[]> data; private HashMap<String, String> metaData;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SieveArray.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SieveArray.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,12 +10,13 @@ import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SieveArray { private static final Logger log = - Logger.getLogger(SieveArray.class); + LogManager.getLogger(SieveArray.class); public static final double EPSILON = 1e-8;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/StaticSQFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/StaticSQFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -27,7 +28,7 @@ public class StaticSQFactory { private static final Logger log = - Logger.getLogger(StaticSQFactory.class); + LogManager.getLogger(StaticSQFactory.class); public static final String SQL_SQ = "SELECT " +
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/resources/Resources.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/resources/Resources.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; @@ -25,7 +26,7 @@ public class Resources { /** The log that is used in this class.*/ - private static Logger log = Logger.getLogger(Resources.class); + private static Logger log = LogManager.getLogger(Resources.class); /** The singleton instance.*/ private static Resources INSTANCE;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/AbstractChartService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/AbstractChartService.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import javax.imageio.ImageIO; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.JFreeChart; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ public static final String DEFAULT_FORMAT = "png"; - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(AbstractChartService.class); // TODO: Load fancy image from resources.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/BedKMChartService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/BedKMChartService.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.imageio.ImageIO; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.DateAxis; @@ -47,7 +48,7 @@ private static final long serialVersionUID = -4946194087923870485L; private static final Logger log = - Logger.getLogger(BedKMChartService.class); + LogManager.getLogger(BedKMChartService.class); public static final int DEFAULT_WIDTH = 240; public static final int DEFAULT_HEIGHT = 180;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/BedloadKMChartService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/BedloadKMChartService.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.imageio.ImageIO; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.DateAxis; @@ -47,7 +48,7 @@ private static final long serialVersionUID = 4156704841305086495L; private static final Logger log = - Logger.getLogger(BedloadKMChartService.class); + LogManager.getLogger(BedloadKMChartService.class); public static final int DEFAULT_WIDTH = 240; public static final int DEFAULT_HEIGHT = 180;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/CrossSectionKMService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/CrossSectionKMService.java Wed Mar 02 10:26:50 2022 +0100 @@ -31,7 +31,8 @@ import net.sf.ehcache.Cache; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -60,7 +61,7 @@ extends D4EService { private static Logger log = - Logger.getLogger(CrossSectionKMService.class); + LogManager.getLogger(CrossSectionKMService.class); public static final String CACHE_NAME = "cross-section-kms";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/D4EService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/D4EService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.GlobalContext; @@ -22,7 +23,7 @@ public abstract class D4EService extends XMLService { - private static final Logger log = Logger.getLogger(D4EService.class); + private static final Logger log = LogManager.getLogger(D4EService.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DischargeInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DischargeInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -36,7 +37,7 @@ public class DischargeInfoService extends D4EService { /** The log used in this service. */ - private static Logger log = Logger.getLogger(DischargeInfoService.class); + private static Logger log = LogManager.getLogger(DischargeInfoService.class); public static final String GAUGE_XPATH = "/art:gauge/text()";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DischargeTablesOverview.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DischargeTablesOverview.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.util.List; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.Marker; @@ -44,7 +45,7 @@ /** Generate Discharge Table chart. */ public class DischargeTablesOverview extends AbstractChartService { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(DischargeTablesOverview.class); private static final long serialVersionUID = 1L;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DistanceInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/DistanceInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Iterator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -34,7 +35,7 @@ public class DistanceInfoService extends D4EService { /** The log used in this service. */ - private static Logger log = Logger.getLogger(DistanceInfoService.class); + private static Logger log = LogManager.getLogger(DistanceInfoService.class); public static final String RIVER_XPATH = "/art:river/text()";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FileUploadService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FileUploadService.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.io.IOException; import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -32,7 +33,7 @@ public class FileUploadService extends D4EService { /** The log used in this service.*/ - private static Logger log = Logger.getLogger(FileUploadService.class); + private static Logger log = LogManager.getLogger(FileUploadService.class); /** XPath that points to the artifact uuid.*/ public static final String XPATH_ARTIFACT_UUID =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FixingsKMChartService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FixingsKMChartService.java Wed Mar 02 10:26:50 2022 +0100 @@ -54,7 +54,8 @@ import javax.imageio.ImageIO; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; @@ -82,7 +83,7 @@ extends DefaultService { private static final Logger log = - Logger.getLogger(FixingsKMChartService.class); + LogManager.getLogger(FixingsKMChartService.class); public static final int DEFAULT_WIDTH = 240; public static final int DEFAULT_HEIGHT = 180;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FixingsOverviewService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/FixingsOverviewService.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.dive4elements.river.artifacts.model.FixingsOverview; import org.dive4elements.river.artifacts.model.FixingsOverviewFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -32,7 +33,7 @@ extends D4EService { private static Logger log = - Logger.getLogger(FixingsOverviewService.class); + LogManager.getLogger(FixingsOverviewService.class); public FixingsOverviewService() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/GaugeInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/GaugeInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -59,7 +60,7 @@ /** The log that is used by this service.*/ - private static Logger log = Logger.getLogger(GaugeInfoService.class); + private static Logger log = LogManager.getLogger(GaugeInfoService.class); public static final String XPATH_RIVERNAME = "/art:river/@name";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/GaugeOverviewInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/GaugeOverviewInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.math.BigDecimal; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -29,7 +30,7 @@ */ public class GaugeOverviewInfoService extends RiverInfoService { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( GaugeOverviewInfoService.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MainValuesService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MainValuesService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +45,7 @@ public class MainValuesService extends D4EService { /** The log that is used by this service.*/ - private static Logger log = Logger.getLogger(MainValuesService.class); + private static Logger log = LogManager.getLogger(MainValuesService.class); /** XPath that points to the river definition of the incoming request.*/ public static final String XPATH_RIVER =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MapInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MapInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -56,7 +57,7 @@ /** The log used in this service.*/ - private static Logger log = Logger.getLogger(MapInfoService.class); + private static Logger log = LogManager.getLogger(MapInfoService.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MeasurementStationInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MeasurementStationInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.List; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -31,7 +32,7 @@ */ public class MeasurementStationInfoService extends RiverInfoService { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( MeasurementStationInfoService.class); public static final DateFormat DATE_FORMAT = DateFormat.getDateInstance(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MetaDataService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MetaDataService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.Map; import java.util.HashMap; @@ -49,7 +50,7 @@ public class MetaDataService extends D4EService { - private static Logger log = Logger.getLogger(MetaDataService.class); + private static Logger log = LogManager.getLogger(MetaDataService.class); public static final String XPATH_ARTIFACT_ID = "/art:meta/art:artifact-id/@value";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ModuleService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ModuleService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -28,7 +29,7 @@ private static final String MODULE = "module"; - private static Logger log = Logger.getLogger(ModuleService.class); + private static Logger log = LogManager.getLogger(ModuleService.class); protected Document doProcess( Document data,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/RiverInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/RiverInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -28,7 +29,7 @@ */ public class RiverInfoService extends D4EService { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( RiverInfoService.class); protected static final String RIVER_XPATH = "/art:river/text()";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/RiverService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/RiverService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ public class RiverService extends D4EService { /** The log used in this service.*/ - private static Logger log = Logger.getLogger(RiverService.class); + private static Logger log = LogManager.getLogger(RiverService.class); @Override protected Document doProcess(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SQKMChartService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SQKMChartService.java Wed Mar 02 10:26:50 2022 +0100 @@ -37,7 +37,8 @@ import javax.imageio.ImageIO; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; @@ -60,7 +61,7 @@ extends DefaultService { private static final Logger log = - Logger.getLogger(SQKMChartService.class); + LogManager.getLogger(SQKMChartService.class); public static final int DEFAULT_WIDTH = 240; public static final int DEFAULT_HEIGHT = 180;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Iterator; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -30,7 +31,7 @@ extends D4EService { /** The log used in this service. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( SedimentLoadInfoService.class); public static final String RIVER_XPATH = "/art:river/text()";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ServerInfoService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ServerInfoService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.GlobalContext; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; @@ -29,7 +30,7 @@ public class ServerInfoService extends D4EService { /** The log used in this service.*/ - private static Logger log = Logger.getLogger(ServerInfoService.class); + private static Logger log = LogManager.getLogger(ServerInfoService.class); private static final String XPATH_HELP_URL = "/artifact-database/help-url/text()";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ThemeListingService.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/ThemeListingService.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ public class ThemeListingService extends D4EService { /** The log used in this service.*/ - private static Logger log = Logger.getLogger(ThemeListingService.class); + private static Logger log = LogManager.getLogger(ThemeListingService.class); private static final String XPATH_THEME_NAME = "/theme/@name";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/AnnotationRiverState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/AnnotationRiverState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; @@ -37,7 +38,7 @@ "facet.longitudinal_section.annotations"; /** The log that is used in this state. */ - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( AnnotationRiverState.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/AreaCreationState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/AreaCreationState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -29,7 +30,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(AreaCreationState.class); + private static Logger log = LogManager.getLogger(AreaCreationState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -29,7 +30,7 @@ public class CalculationSelect extends DefaultState { /** The log that is used in this class. */ - private static Logger log = Logger.getLogger(CalculationSelect.class); + private static Logger log = LogManager.getLogger(CalculationSelect.class); /** Name of data item. */ public static final String FIELD_MODE = "calculation_mode";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelectMinfo.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/CalculationSelectMinfo.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -29,7 +30,7 @@ public class CalculationSelectMinfo extends DefaultState { /** The log that is used in this class. */ - private static Logger log = Logger.getLogger(CalculationSelectMinfo.class); + private static Logger log = LogManager.getLogger(CalculationSelectMinfo.class); public static final String FIELD_MODE = "calculation_mode";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ComputationRangeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ComputationRangeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ implements FacetTypes { private static Logger log = - Logger.getLogger(ComputationRangeState.class); + LogManager.getLogger(ComputationRangeState.class); /** The default step width. */ public static final int DEFAULT_STEP = 100;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ComputedDischargeCurveState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ComputedDischargeCurveState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -44,7 +45,7 @@ { /** The log that is used in this state. */ private static Logger log = - Logger.getLogger(ComputedDischargeCurveState.class); + LogManager.getLogger(ComputedDischargeCurveState.class); public ComputedDischargeCurveState() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DGMSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DGMSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -31,7 +32,7 @@ */ public class DGMSelect extends DefaultState { - private static final Logger log = Logger.getLogger(DGMSelect.class); + private static final Logger log = LogManager.getLogger(DGMSelect.class); public static final String ERR_EMPTY = "error_no_dgm_selected"; public static final String ERR_INVALID_DGM = "error_invalid_dgm_selected";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DefaultState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DefaultState.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Map; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -45,7 +46,7 @@ public class DefaultState extends AbstractState { /** The log that is used in this class. */ - private static Logger log = Logger.getLogger(DefaultState.class); + private static Logger log = LogManager.getLogger(DefaultState.class); /** The three possible compute types. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeLongitudinalSection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeLongitudinalSection.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,14 +33,15 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class DischargeLongitudinalSection extends DefaultState implements FacetTypes { private static Logger log = - Logger.getLogger(DischargeLongitudinalSection.class); + LogManager.getLogger(DischargeLongitudinalSection.class); static { // Active/deactivate facets.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.Collections; import java.util.Comparator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -32,7 +33,7 @@ public static final String TOTAL_CHANNEL = "total_channel"; - private static final Logger log = Logger.getLogger(DischargeState.class); + private static final Logger log = LogManager.getLogger(DischargeState.class); /** Let client display a matrix. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlySelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlySelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; @@ -18,7 +19,7 @@ public class DistanceOnlySelect extends DistanceSelect { - private static Logger log = Logger.getLogger(DistanceOnlySelect.class); + private static Logger log = LogManager.getLogger(DistanceOnlySelect.class); @Override protected String getUIProvider() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -17,7 +18,7 @@ public class DistanceSelect extends ComputationRangeState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(DistanceSelect.class); + private static Logger log = LogManager.getLogger(DistanceSelect.class); public DistanceSelect() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DurationCurveState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DurationCurveState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -46,7 +47,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(DurationCurveState.class); + private static Logger log = LogManager.getLogger(DurationCurveState.class); public DurationCurveState() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/EnterMultipleLocationsState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/EnterMultipleLocationsState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.dive4elements.artifacts.Artifact; @@ -23,7 +24,7 @@ */ public class EnterMultipleLocationsState extends EnterLocationState { /** The log for this class. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( EnterMultipleLocationsState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.velocity.Template; import org.apache.commons.io.FileUtils; import org.dive4elements.artifactdatabase.state.Facet; @@ -73,7 +74,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(FloodMapState.class); + private static Logger log = LogManager.getLogger(FloodMapState.class); public static final String KEEP_ARTIFACT_DIR =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodplainChoice.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodplainChoice.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -33,7 +34,7 @@ public static final String INACTIVE = "floodplain.inactive"; private static final Logger log = - Logger.getLogger(FloodplainChoice.class); + LogManager.getLogger(FloodplainChoice.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FlowVelocityState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FlowVelocityState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; @@ -34,7 +35,7 @@ /* State in which flow velocities can/will be calculated. */ public class FlowVelocityState extends DefaultState implements FacetTypes { - private static Logger log = Logger.getLogger(FlowVelocityState.class); + private static Logger log = LogManager.getLogger(FlowVelocityState.class); public static final String I18N_MAINCHANNEL_FACET = "facet.flow_velocity.mainchannel";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeDischargeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.List; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.CallContext; @@ -46,7 +47,7 @@ /** The log that is used in this state. */ private static final Logger log = - Logger.getLogger(GaugeDischargeState.class); + LogManager.getLogger(GaugeDischargeState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeTimerangeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/GaugeTimerangeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; @@ -29,7 +30,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(GaugeTimerangeState.class); + LogManager.getLogger(GaugeTimerangeState.class); /** Get 'min' and 'max'times of gauge time intervals. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -38,7 +39,7 @@ { /** The log that is used in this class.*/ - private static Logger log = Logger.getLogger(HWSBarriersState.class); + private static Logger log = LogManager.getLogger(HWSBarriersState.class); private static final String HWS_SHAPEFILE_LINES = "hws-lines.shp"; private static final String HWS_SHAPEFILE_POINTS = "hws-points.shp";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSDatacageState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSDatacageState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.dive4elements.artifacts.Artifact; @@ -21,7 +22,7 @@ extends DefaultState { - private static final Logger log = Logger.getLogger(HWSDatacageState.class); + private static final Logger log = LogManager.getLogger(HWSDatacageState.class); @Override protected String getUIProvider() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeComputeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeComputeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; @@ -52,7 +53,7 @@ extends DefaultState implements FacetTypes { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(HistoricalDischargeComputeState.class); public static final String DEFAULT_UNIT = "cm";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -28,7 +29,7 @@ public class HistoricalDischargeState extends DefaultState { private static final Logger log = - Logger.getLogger(HistoricalDischargeState.class); + LogManager.getLogger(HistoricalDischargeState.class); public static final String I18N_MODE_W = "historical.mode.w"; public static final String I18N_MODE_Q = "historical.mode.q";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/InputDoubleState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/InputDoubleState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; @@ -18,7 +19,7 @@ */ public class InputDoubleState extends MinMaxState { - private static final Logger log = Logger.getLogger(InputDoubleState.class); + private static final Logger log = LogManager.getLogger(InputDoubleState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/IntRangeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/IntRangeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; @@ -18,7 +19,7 @@ */ public class IntRangeState extends MinMaxState { - private static final Logger log = Logger.getLogger(IntRangeState.class); + private static final Logger log = LogManager.getLogger(IntRangeState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/LocationDistanceSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/LocationDistanceSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; @@ -28,7 +29,7 @@ { /** The log used in this class. */ - private static Logger log = Logger.getLogger(LocationDistanceSelect.class); + private static Logger log = LogManager.getLogger(LocationDistanceSelect.class); /** The name of the 'mode' field. */ public static final String MODE = "ld_mode";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/LocationSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/LocationSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ public class LocationSelect extends LocationDistanceSelect { /** The log used in this class.*/ - private static Logger log = Logger.getLogger(LocationSelect.class); + private static Logger log = LogManager.getLogger(LocationSelect.class); public LocationSelect() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ManualPointsSingleState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ManualPointsSingleState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.json.JSONArray; import org.json.JSONException; @@ -45,7 +46,7 @@ /** The log that is used in this state. */ private static final Logger log = - Logger.getLogger(ManualPointsSingleState.class); + LogManager.getLogger(ManualPointsSingleState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MiddleBedHeight.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MiddleBedHeight.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.Artifact; @@ -36,7 +37,7 @@ public class MiddleBedHeight extends DefaultState implements FacetTypes { /** Private log. */ - private static final Logger log = Logger.getLogger(MiddleBedHeight.class); + private static final Logger log = LogManager.getLogger(MiddleBedHeight.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MinMaxState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MinMaxState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -30,7 +31,7 @@ */ public abstract class MinMaxState extends DefaultState { - private static final Logger log = Logger.getLogger(MinMaxState.class); + private static final Logger log = LogManager.getLogger(MinMaxState.class); @Override protected void appendItems(
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MultiIntArrayState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MultiIntArrayState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -31,7 +32,7 @@ public abstract class MultiIntArrayState extends DefaultState { private static final Logger log = - Logger.getLogger(MultiIntArrayState.class); + LogManager.getLogger(MultiIntArrayState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MultiStringArrayState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MultiStringArrayState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -29,7 +30,7 @@ public abstract class MultiStringArrayState extends DefaultState { private static final Logger log = - Logger.getLogger(MultiStringArrayState.class); + LogManager.getLogger(MultiStringArrayState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/OutliersInput.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/OutliersInput.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.data.StateData; import org.dive4elements.artifacts.CallContext; @@ -19,7 +20,7 @@ public class OutliersInput extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(OutliersInput.class); + private static Logger log = LogManager.getLogger(OutliersInput.class); public static final String PARAMETER_NAME = "outliers";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/PeriodsSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/PeriodsSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> @@ -16,7 +17,7 @@ public class PeriodsSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(PeriodsSelect.class); + private static Logger log = LogManager.getLogger(PeriodsSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/QSectorSingleState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/QSectorSingleState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.artifacts.CallContext; @@ -38,7 +39,7 @@ /** The log that is used in this state. */ private static final Logger log = - Logger.getLogger(QSectorSingleState.class); + LogManager.getLogger(QSectorSingleState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/RangeState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/RangeState.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import org.dive4elements.river.artifacts.access.RangeAccess; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -24,7 +25,7 @@ public abstract class RangeState extends DefaultState { /** The log that is used in this class. */ - private Logger log = Logger.getLogger(RangeState.class); + private Logger log = LogManager.getLogger(RangeState.class); public RangeState() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ReferenceCurveState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ReferenceCurveState.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** State of WINFO in which reference curves can be produced. */ @@ -32,7 +33,7 @@ extends DefaultState implements FacetTypes { - private static Logger log = Logger.getLogger(ReferenceCurveState.class); + private static Logger log = LogManager.getLogger(ReferenceCurveState.class); public ReferenceCurveState() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/RiverSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/RiverSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -36,7 +37,7 @@ public class RiverSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(RiverSelect.class); + private static Logger log = LogManager.getLogger(RiverSelect.class); /** Error message that is thrown if no river was found based on a given * name.*/
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Wed Mar 02 10:26:50 2022 +0100 @@ -38,14 +38,15 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> */ public class SQRelation extends DefaultState implements FacetTypes { - private static Logger log = Logger.getLogger(SQRelation.class); + private static Logger log = LogManager.getLogger(SQRelation.class); public static final String I18N_FACET_CURVE =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ScenarioSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ScenarioSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.io.File; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; /** @@ -29,7 +30,7 @@ public class ScenarioSelect extends DefaultState { /** The log that is used in this class.*/ - private static Logger log = Logger.getLogger(ScenarioSelect.class); + private static Logger log = LogManager.getLogger(ScenarioSelect.class); public static final String FIELD_MODE = "scenario";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.Collections; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.common.model.KVP; @@ -34,7 +35,7 @@ public static final String PREFIX_SINGLE = "single-"; /** Private log. */ - private static final Logger log = Logger.getLogger(SoundingsSelect.class); + private static final Logger log = LogManager.getLogger(SoundingsSelect.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StateFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StateFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -27,7 +28,7 @@ public class StateFactory { /** The log used in this class */ - private static Logger log = Logger.getLogger(StateFactory.class); + private static Logger log = LogManager.getLogger(StateFactory.class); /** The XPath to the classname of the state */ public static final String XPATH_STATE = "@state";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticHYKState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticHYKState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -32,7 +33,7 @@ implements FacetTypes { /** The log that is used in this state. */ - transient private static final Logger log = Logger.getLogger( + transient private static final Logger log = LogManager.getLogger( StaticHYKState.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.FacetTypes; @@ -31,7 +32,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static final Logger log = Logger.getLogger(StaticState.class); + private static final Logger log = LogManager.getLogger(StaticState.class); private static String uiprovider;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticWQKmsState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/StaticWQKmsState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -37,7 +38,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(StaticWQKmsState.class); + private static Logger log = LogManager.getLogger(StaticWQKmsState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; @@ -50,7 +51,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(WDifferencesState.class); + private static Logger log = LogManager.getLogger(WDifferencesState.class); private static final String I18N_DIFFERENCES_FACET_NAME = "facet.w_differences";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WMSBackgroundState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WMSBackgroundState.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -50,7 +51,7 @@ protected Map<String, String> variables; - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( WMSBackgroundState.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQAdapted.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQAdapted.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Comparator; import java.util.Collections; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -46,7 +47,7 @@ public class WQAdapted extends DefaultState { /** The log used in this state.*/ - private static Logger log = Logger.getLogger(WQAdapted.class); + private static Logger log = LogManager.getLogger(WQAdapted.class); public static final String FIELD_WQ_MODE = "wq_isq";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQFixing.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQFixing.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.RangeWithValues; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * State to input W/Q data for fixings @@ -20,7 +21,7 @@ public class WQFixing extends WQAdapted { /** The log used in this state.*/ - private static Logger log = Logger.getLogger(WQFixing.class); + private static Logger log = LogManager.getLogger(WQFixing.class); /** Simple sanity check if values are positive numbers **/ @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import gnu.trove.TDoubleArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -48,7 +49,7 @@ public class WQSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(WQSelect.class); + private static Logger log = LogManager.getLogger(WQSelect.class); /** The default step width for Qs. */ public static final String DEFAULT_STEP_Q = "50";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelGroundDifferences.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelGroundDifferences.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; @@ -36,7 +37,7 @@ private static Logger log = - Logger.getLogger(WaterlevelGroundDifferences.class); + LogManager.getLogger(WaterlevelGroundDifferences.class); protected String getLowerField() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelInfoState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelInfoState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -34,7 +35,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(WaterlevelInfoState.class); + private static Logger log = LogManager.getLogger(WaterlevelInfoState.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelPairSelectState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelPairSelectState.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -36,7 +37,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( WaterlevelPairSelectState.class);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelSelectState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelSelectState.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -37,7 +38,7 @@ public class WaterlevelSelectState extends DefaultState { private static final Logger log = - Logger.getLogger(WaterlevelSelectState.class); + LogManager.getLogger(WaterlevelSelectState.class); public static final String SPLIT_CHAR = ";";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.CallContext; @@ -37,7 +38,7 @@ implements FacetTypes { /** The log that is used in this state. */ - private static Logger log = Logger.getLogger(WaterlevelState.class); + private static Logger log = LogManager.getLogger(WaterlevelState.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeCompute.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeCompute.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,7 +33,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** State in which to deliver extreme value analysis result. */ @@ -42,7 +43,7 @@ implements FacetTypes { /** Private log. */ - private static Logger log = Logger.getLogger(ExtremeCompute.class); + private static Logger log = LogManager.getLogger(ExtremeCompute.class); public ExtremeCompute() {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeQInput.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeQInput.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -52,7 +53,7 @@ public class ExtremeQInput extends DefaultState { /** The log used in this state.*/ - private static Logger log = Logger.getLogger(ExtremeQInput.class); + private static Logger log = LogManager.getLogger(ExtremeQInput.class); /** Trivial, empty constructor. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/PercentInput.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/PercentInput.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.extreme; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.data.StateData; import org.dive4elements.artifacts.CallContext; @@ -21,7 +22,7 @@ public class PercentInput extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(PercentInput.class); + private static Logger log = LogManager.getLogger(PercentInput.class); public static final String PARAMETER_NAME = "percent";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/AnalysisPeriods.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/AnalysisPeriods.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -18,7 +19,7 @@ public class AnalysisPeriods extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(AnalysisPeriods.class); + private static Logger log = LogManager.getLogger(AnalysisPeriods.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/EventSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/EventSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; @@ -34,7 +35,7 @@ public class EventSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(EventSelect.class); + private static Logger log = LogManager.getLogger(EventSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixAnalysisCompute.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixAnalysisCompute.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; @@ -54,7 +55,7 @@ implements FacetTypes { /** The log used in this class. */ - private static Logger log = Logger.getLogger(FixAnalysisCompute.class); + private static Logger log = LogManager.getLogger(FixAnalysisCompute.class); private static final String I18N_REFERENCEPERIOD_SHORT = "fix.reference.period.event.short";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.CallContext; @@ -46,7 +47,7 @@ public class FixRealizingCompute extends DefaultState implements FacetTypes { /** The log used in this class. */ - private static Logger log = Logger.getLogger(FixRealizingCompute.class); + private static Logger log = LogManager.getLogger(FixRealizingCompute.class); public static final String I18N_WQ_CURVE = "fix.vollmer.wq.curve";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixationPeriod.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixationPeriod.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -18,7 +19,7 @@ public class FixationPeriod extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(FixationPeriod.class); + private static Logger log = LogManager.getLogger(FixationPeriod.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/GaugeRange.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/GaugeRange.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -18,7 +19,7 @@ public class GaugeRange extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(GaugeRange.class); + private static Logger log = LogManager.getLogger(GaugeRange.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/LocationSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/LocationSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; @@ -24,7 +25,7 @@ public class LocationSelect extends RangeState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(LocationSelect.class); + private static Logger log = LogManager.getLogger(LocationSelect.class); /** * The default constructor that initializes an empty State object.
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/QSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/QSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -18,7 +19,7 @@ public class QSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(QSelect.class); + private static Logger log = LogManager.getLogger(QSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/ReferencePeriod.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/ReferencePeriod.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.fixation; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -18,7 +19,7 @@ public class ReferencePeriod extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(ReferencePeriod.class); + private static Logger log = LogManager.getLogger(ReferencePeriod.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityDistanceSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityDistanceSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -29,7 +30,7 @@ /** Extended Distance Select with default values appropiate for BedQuality */ public class BedQualityDistanceSelect extends DistanceSelect { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedQualityDistanceSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityPeriodsSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityPeriodsSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.TreeSet; import java.text.DateFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -40,7 +41,7 @@ public class BedQualityPeriodsSelect extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( BedQualityPeriodsSelect.class); private static final String I18N_NO_DATA =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; @@ -44,7 +45,7 @@ private static final long serialVersionUID = 1L; - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(BedQualityState.class); /* The suffix to append to interpol facets. */
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/CharDiameter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/CharDiameter.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -22,7 +23,7 @@ public class CharDiameter extends MultiStringArrayState { - private static final Logger log = Logger.getLogger(CharDiameter.class); + private static final Logger log = LogManager.getLogger(CharDiameter.class); public static final String UI_PROVIDER = "parameter-matrix";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; @@ -48,7 +49,7 @@ implements FacetTypes { /** The log used in this class. */ - private static Logger log = Logger.getLogger(DifferencesState.class); + private static Logger log = LogManager.getLogger(DifferencesState.class); public static final String I18N_DIFF_YEAR = "beddifference.year"; public static final String I18N_FACET_BED_DIFF_YEAR =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadDataCalculate.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadDataCalculate.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.FacetActivity; import org.dive4elements.artifacts.Artifact; @@ -36,7 +37,7 @@ private static final long serialVersionUID = 1L; - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(SedimentLoadDataCalculate.class); public static final String I18N_FACET_SEDIMENTLOAD_COARSE =
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadEpochSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadEpochSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.states.DefaultState; @@ -17,7 +18,7 @@ extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(SedimentLoadEpochSelect.class); + private static Logger log = LogManager.getLogger(SedimentLoadEpochSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadUnit.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadUnit.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.dive4elements.artifacts.Artifact; @@ -23,7 +24,7 @@ extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(SedimentLoadUnit.class); + private static Logger log = LogManager.getLogger(SedimentLoadUnit.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadYearSelect.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadYearSelect.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.minfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; @@ -23,7 +24,7 @@ extends DefaultState { /** The log used in this class. */ - private static Logger log = Logger.getLogger(SedimentLoadYearSelect.class); + private static Logger log = LogManager.getLogger(SedimentLoadYearSelect.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/OutlierMethod.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/OutlierMethod.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.artifacts.states.sq; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.dive4elements.artifactdatabase.ProtocolUtils; @@ -24,7 +25,7 @@ extends DefaultState { /** The log that is used in this class.*/ - private static Logger log = Logger.getLogger(OutlierMethod.class); + private static Logger log = LogManager.getLogger(OutlierMethod.class); public static final String STD_DEV = "outlier.method.std-dev"; public static final String GRUBBS = "outlier.method.grubbs";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/SQStaticState.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/SQStaticState.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; import java.text.SimpleDateFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.CallContext; @@ -33,7 +34,7 @@ { private static final Logger log = - Logger.getLogger(SQStaticState.class); + LogManager.getLogger(SQStaticState.class); private static final String FACET_DESCRIPTION = "facet.sq_relation.static_data";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/StaticSQRelationFacet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/StaticSQRelationFacet.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.DefaultFacet; import org.dive4elements.artifactdatabase.state.Facet; @@ -32,7 +33,7 @@ private StaticSQRelation relation; private static final Logger log = - Logger.getLogger(StaticSQRelationFacet.class); + LogManager.getLogger(StaticSQRelationFacet.class); public StaticSQRelationFacet( int ndx,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/transitions/TransitionFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/transitions/TransitionFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Node; @@ -25,7 +26,7 @@ public class TransitionFactory { /** The log used in this class */ - private static Logger log = Logger.getLogger(TransitionFactory.class); + private static Logger log = LogManager.getLogger(TransitionFactory.class); /** The XPath to the classname of the transition */ public static final String XPATH_TRANSITION = "@transition";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/transitions/ValueCompareTransition.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/transitions/ValueCompareTransition.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Node; @@ -33,7 +34,7 @@ public class ValueCompareTransition extends DefaultTransition { /** The log that is used in this transition.*/ - private static Logger log = Logger.getLogger(ValueCompareTransition.class); + private static Logger log = LogManager.getLogger(ValueCompareTransition.class); /** XPath that points to the condition's operator.*/
--- a/artifacts/src/main/java/org/dive4elements/river/collections/AttributeParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/AttributeParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -43,7 +44,7 @@ "/art:attribute/art:outputs/art:output"; - private static Logger log = Logger.getLogger(AttributeParser.class); + private static Logger log = LogManager.getLogger(AttributeParser.class); protected Document attributeDocument;
--- a/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.ArtifactDatabase; import org.dive4elements.artifacts.ArtifactDatabaseException; @@ -57,7 +58,7 @@ protected CollectionAttribute attribute; - private static Logger log = Logger.getLogger(AttributeWriter.class); + private static Logger log = LogManager.getLogger(AttributeWriter.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/collections/CollectionAttribute.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/CollectionAttribute.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.ArtifactNamespaceContext; @@ -39,7 +40,7 @@ /** Privately owned log. */ private static final Logger log = - Logger.getLogger(CollectionAttribute.class); + LogManager.getLogger(CollectionAttribute.class); protected ElementCreator ec;
--- a/artifacts/src/main/java/org/dive4elements/river/collections/CollectionDescriptionHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/CollectionDescriptionHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -31,7 +32,7 @@ public class CollectionDescriptionHelper { private static final Logger log = - Logger.getLogger(CollectionDescriptionHelper.class); + LogManager.getLogger(CollectionDescriptionHelper.class); public static final String XPATH_ARTIFACT_STATE_DATA =
--- a/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -51,7 +52,7 @@ */ public class D4EArtifactCollection extends DefaultArtifactCollection { /** The log used in this class. */ - private static Logger log = Logger.getLogger(D4EArtifactCollection.class); + private static Logger log = LogManager.getLogger(D4EArtifactCollection.class); /** Constant XPath that points to the outputmodes of an artifact. */ public static final String XPATH_ARTIFACT_OUTPUTMODES =
--- a/artifacts/src/main/java/org/dive4elements/river/collections/OutputParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/collections/OutputParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.ArtifactDatabase; import org.dive4elements.artifacts.ArtifactDatabaseException; @@ -38,7 +39,7 @@ public static final String XPATH_ARTIFACT_OUTPUTMODES = "/art:result/art:outputmodes/art:output"; - private static Logger log = Logger.getLogger(OutputParser.class); + private static Logger log = LogManager.getLogger(OutputParser.class); protected ArtifactDatabase db; protected CallMeta meta;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -37,7 +38,7 @@ public class ATExporter implements OutGenerator { - private static Logger log = Logger.getLogger(ATExporter.class); + private static Logger log = LogManager.getLogger(ATExporter.class); public static final String DEFAULT_ENCODING = "UTF-8";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATWriter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATWriter.java Wed Mar 02 10:26:50 2022 +0100 @@ -31,12 +31,13 @@ import org.apache.commons.math.FunctionEvaluationException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Write AT files. */ public class ATWriter { - private static Logger log = Logger.getLogger(ATWriter.class); + private static Logger log = LogManager.getLogger(ATWriter.class); public static final int COLUMNS = 10;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/AbstractExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/AbstractExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -45,7 +46,7 @@ public abstract class AbstractExporter implements OutGenerator { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(AbstractExporter.class); + private static Logger log = LogManager.getLogger(AbstractExporter.class); /* XXX: Why does AbstractExporter do not implement FacetTypes? */ public static String FIX_PARAMETERS = "fix_parameters";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartExportHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartExportHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -39,7 +39,8 @@ import org.apache.batik.svggen.SVGGraphics2D; import org.apache.batik.svggen.SVGGraphics2DIOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.XYPlot; @@ -86,7 +87,7 @@ /** * Logger used for logging with log4j. */ - private static Logger log = Logger.getLogger(ChartExportHelper.class); + private static Logger log = LogManager.getLogger(ChartExportHelper.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -52,7 +52,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; @@ -82,7 +83,7 @@ */ public abstract class ChartGenerator implements OutGenerator { - private static Logger log = Logger.getLogger(ChartGenerator.class); + private static Logger log = LogManager.getLogger(ChartGenerator.class); public static final int DEFAULT_CHART_WIDTH = 600; public static final int DEFAULT_CHART_HEIGHT = 400;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java Wed Mar 02 10:26:50 2022 +0100 @@ -30,7 +30,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Settings; import org.dive4elements.artifacts.Artifact; @@ -81,7 +82,7 @@ */ public abstract class ChartGenerator2 implements OutGenerator { - private static Logger log = Logger.getLogger(ChartGenerator2.class); + private static Logger log = LogManager.getLogger(ChartGenerator2.class); public static final boolean USE_NOP_GRAPHICS = Boolean.getBoolean("info.rendering.nop.graphics");
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.jfree.data.time.TimeSeriesCollection; import org.jfree.data.time.TimeSeries; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.jfree.Bounds; import org.dive4elements.river.jfree.DoubleBounds; @@ -27,7 +28,7 @@ */ public class ChartHelper { - private static final Logger log = Logger.getLogger(ChartHelper.class); + private static final Logger log = LogManager.getLogger(ChartHelper.class); /**
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartInfoGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartInfoGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.JFreeChart; @@ -55,7 +56,7 @@ /** The log used in this generator.*/ private static Logger log = - Logger.getLogger(ChartInfoGenerator.class); + LogManager.getLogger(ChartInfoGenerator.class); /** The OutGenerator that creates the charts.*/
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartSection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartSection.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -16,7 +17,7 @@ */ public class ChartSection extends TypeSection { - private static Logger log = Logger.getLogger(ChartSection.class); + private static Logger log = LogManager.getLogger(ChartSection.class); public static final String TITLE_ATTR = "title"; public static final String SUBTITLE_ATTR = "subtitle";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartSettings.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartSettings.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -27,7 +28,7 @@ */ public class ChartSettings extends DefaultSettings { - private static final Logger log = Logger.getLogger(ChartSettings.class); + private static final Logger log = LogManager.getLogger(ChartSettings.class); protected ChartSection chartSection; protected LegendSection legendSection;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import java.text.DateFormat; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -54,7 +55,7 @@ /** The log used in this exporter.*/ private static Logger log = - Logger.getLogger(ComputedDischargeCurveExporter.class); + LogManager.getLogger(ComputedDischargeCurveExporter.class); public static final String CSV_W_HEADER = "export.computed.discharge.curve.csv.header.w";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/CrossSectionGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/CrossSectionGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.text.NumberFormat; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.LegendItemCollection; import org.jfree.chart.annotations.XYBoxAnnotation; import org.jfree.chart.annotations.XYTextAnnotation; @@ -48,7 +49,7 @@ { /** The log that is used in this generator. */ private static Logger log = - Logger.getLogger(CrossSectionGenerator.class); + LogManager.getLogger(CrossSectionGenerator.class); public static final String I18N_CHART_TITLE = "chart.cross_section.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import org.dive4elements.river.exports.process.Processor; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; @@ -28,7 +29,7 @@ public class DiagramAttributes implements ElementConverter, D4EArtifact.FacetFilter { - private static Logger log = Logger.getLogger(DiagramAttributes.class); + private static Logger log = LogManager.getLogger(DiagramAttributes.class); public interface Evaluator { Object evaluate(D4EArtifact artifact, CallContext context);
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,7 +28,8 @@ import javax.swing.ImageIcon; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Facet; @@ -99,7 +100,7 @@ public static final int AXIS_SPACE = 5; /** The log that is used in this generator. */ - private static Logger log = Logger.getLogger(DiagramGenerator.class); + private static Logger log = LogManager.getLogger(DiagramGenerator.class); protected List<Marker> domainMarkers = new ArrayList<Marker>();
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -30,7 +30,8 @@ import org.dive4elements.artifactdatabase.state.State; import org.dive4elements.river.artifacts.GaugeDischargeCurveArtifact; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.annotations.XYTextAnnotation; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.XYPlot; @@ -59,7 +60,7 @@ /** The log used in this generator. */ private static Logger log = - Logger.getLogger(DischargeCurveGenerator.class); + LogManager.getLogger(DischargeCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.discharge.curve.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -9,7 +9,8 @@ import java.awt.Font; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.exports.injector.InjectorConstants; import org.dive4elements.river.jfree.AxisDataset; @@ -24,7 +25,7 @@ extends DiagramGenerator implements InjectorConstants { - private static Logger log = Logger.getLogger(DischargeGenerator.class); + private static Logger log = LogManager.getLogger(DischargeGenerator.class); private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.cm.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeLongitudinalSectionExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeLongitudinalSectionExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.text.NumberFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> @@ -25,7 +26,7 @@ /** The log used in this exporter.*/ private static Logger log = - Logger.getLogger(DischargeLongitudinalSectionExporter.class); + LogManager.getLogger(DischargeLongitudinalSectionExporter.class); public static final String CSV_KM_HEADER =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.text.DateFormat; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -49,7 +50,7 @@ public class DurationCurveExporter extends AbstractExporter { /** The log used in this exporter. */ - private static Logger log = Logger.getLogger(DurationCurveExporter.class); + private static Logger log = LogManager.getLogger(DurationCurveExporter.class); public static final String CSV_DURATION_HEADER =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import java.awt.Font; import java.awt.geom.Point2D; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.XYPlot; @@ -47,7 +48,7 @@ /** Local log. */ private static Logger log = - Logger.getLogger(DurationCurveGenerator.class); + LogManager.getLogger(DurationCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.duration.curve.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -30,7 +31,7 @@ public class FlowVelocityExporter extends AbstractExporter { private static final Logger log = - Logger.getLogger(FlowVelocityExporter.class); + LogManager.getLogger(FlowVelocityExporter.class); public static final String CSV_KM =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.HashMap; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -49,7 +50,7 @@ public class HistoricalDischargeCurveExporter extends AbstractExporter { private static final Logger log = - Logger.getLogger(HistoricalDischargeCurveExporter.class); + LogManager.getLogger(HistoricalDischargeCurveExporter.class); public static final String CSV_TIMERANGE_HEADER =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -44,7 +45,7 @@ public class HistoricalDischargeCurveGenerator extends TimeseriesChartGenerator implements FacetTypes { - private static Logger log = Logger + private static Logger log = LogManager .getLogger(HistoricalDischargeCurveGenerator.class); public static final String I18N_CHART_TITLE =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.JFreeChart; @@ -44,7 +45,7 @@ /** Private logging instance. */ private static final Logger log = - Logger.getLogger(InfoGeneratorHelper.class); + LogManager.getLogger(InfoGeneratorHelper.class); protected ChartGenerator generator;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper2.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper2.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.JFreeChart; @@ -42,7 +43,7 @@ /** Private logging instance. */ private static final Logger log = - Logger.getLogger(InfoGeneratorHelper2.class); + LogManager.getLogger(InfoGeneratorHelper2.class); protected ChartGenerator2 generator;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,7 +28,8 @@ import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; import org.dive4elements.river.utils.RiverUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.XYPlot; @@ -56,7 +57,7 @@ /** The log that is used in this generator. */ private static Logger log = - Logger.getLogger(LongitudinalSectionGenerator.class); + LogManager.getLogger(LongitudinalSectionGenerator.class); /** Key to look up internationalized String for annotations label. */ public static final String I18N_ANNOTATIONS_LABEL =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,11 +23,12 @@ import java.util.List; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class LongitudinalSectionGenerator2 extends DiagramGenerator { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( LongitudinalSectionGenerator2.class); /** Wrapper around the doOut info for postprocessing. */
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -35,7 +35,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +45,7 @@ public class MapGenerator implements OutGenerator, FacetTypes { - private static Logger log = Logger.getLogger(MapGenerator.class); + private static Logger log = LogManager.getLogger(MapGenerator.class); protected D4EArtifactCollection collection;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -37,7 +38,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(MiddleBedHeightExporter.class); + LogManager.getLogger(MiddleBedHeightExporter.class); public static final String CSV_KM = "export.bedheight_middle.csv.header.km";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/OutputHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/OutputHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -47,7 +48,7 @@ public class OutputHelper { /** The log used in this class. */ - private static Logger log = Logger.getLogger(OutputHelper.class); + private static Logger log = LogManager.getLogger(OutputHelper.class); protected String identifier; private D4EArtifact masterArtifact; @@ -521,7 +522,7 @@ * Inner class to structure/order the themes of a chart. */ private static class ThemeList { - private Logger log = Logger.getLogger(ThemeList.class); + private Logger log = LogManager.getLogger(ThemeList.class); protected List<ManagedFacet> themes; public ThemeList(Document output) {
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -43,7 +43,8 @@ import net.sf.jasperreports.engine.JasperFillManager; import net.sf.jasperreports.engine.JasperPrint; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * (CSV)Exporter for Reference Curves. @@ -51,7 +52,7 @@ public class ReferenceCurveExporter extends AbstractExporter { /** The log used in this exporter. */ - private static Logger log = Logger.getLogger(ReferenceCurveExporter.class); + private static Logger log = LogManager.getLogger(ReferenceCurveExporter.class); public static final String RC_CSV_KM_HEADER = "export.reference_curve.csv.header.km";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.awt.geom.Point2D; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.NumberTickUnit; import org.jfree.chart.axis.TickUnits; @@ -45,7 +46,7 @@ /** House log. */ private static Logger log = - Logger.getLogger(ReferenceCurveGenerator.class); + LogManager.getLogger(ReferenceCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.reference.curve.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReportGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReportGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; @@ -31,7 +32,7 @@ public class ReportGenerator implements OutGenerator { - private static Logger log = Logger.getLogger(ReportGenerator.class); + private static Logger log = LogManager.getLogger(ReportGenerator.class); protected Document result; protected OutputStream out;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ShapeExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ShapeExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Settings; import org.dive4elements.artifacts.Artifact; @@ -29,7 +30,7 @@ public class ShapeExporter implements OutGenerator { private static final String XPATH_FACET = "/art:action/@art:type"; - private static Logger log = Logger.getLogger(ShapeExporter.class); + private static Logger log = LogManager.getLogger(ShapeExporter.class); private Artifact master; private Document request; private OutputStream out;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/StyledSeriesBuilder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/StyledSeriesBuilder.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; @@ -28,7 +29,7 @@ */ final static double BIG_DOUBLE_VALUE = 1234567d; - private static final Logger log = Logger.getLogger + private static final Logger log = LogManager.getLogger (StyledSeriesBuilder.class);
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,7 +33,8 @@ import javax.swing.ImageIcon; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItem; @@ -71,7 +72,7 @@ protected boolean domainZeroLineVisible; private static final Logger log = - Logger.getLogger(TimeseriesChartGenerator.class); + LogManager.getLogger(TimeseriesChartGenerator.class); public static final int AXIS_SPACE = 5;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TypeSection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/TypeSection.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.Attribute; import org.dive4elements.artifactdatabase.state.DefaultSection; @@ -19,7 +20,7 @@ */ public class TypeSection extends DefaultSection { - private static final Logger log = Logger.getLogger(TypeSection.class); + private static final Logger log = LogManager.getLogger(TypeSection.class); public TypeSection(String key) { super(key);
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WDifferencesExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/WDifferencesExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import java.text.DateFormat; import java.util.Locale; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -49,7 +50,7 @@ public class WDifferencesExporter extends AbstractExporter { /** The log used in this exporter. */ - private static Logger log = Logger.getLogger(WDifferencesExporter.class); + private static Logger log = LogManager.getLogger(WDifferencesExporter.class); public static final String WDIFF_CSV_KM_HEADER =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; @@ -69,7 +70,7 @@ public class WaterlevelExporter extends AbstractExporter { /** The log used in this exporter.*/ - private static Logger log = Logger.getLogger(WaterlevelExporter.class); + private static Logger log = LogManager.getLogger(WaterlevelExporter.class); public static final String FACET_WST = "wst";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WstWriter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/WstWriter.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.commons.lang.StringUtils; import org.dive4elements.river.artifacts.model.WstLine; @@ -46,7 +47,7 @@ public class WstWriter { /** The log used in this class. */ - private static Logger log = Logger.getLogger(WstWriter.class); + private static Logger log = LogManager.getLogger(WstWriter.class); /** The default unit that is written into the header of the WST. */ public static final String DEFAULT_UNIT = "Wassserstand [NN + m]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import javax.swing.ImageIcon; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItem; @@ -75,7 +76,7 @@ public static final int AXIS_SPACE = 5; /** The log that is used in this generator. */ - private static Logger log = Logger.getLogger(XYChartGenerator.class); + private static Logger log = LogManager.getLogger(XYChartGenerator.class); protected List<Marker> domainMarkers = new ArrayList<Marker>();
--- a/artifacts/src/main/java/org/dive4elements/river/exports/extreme/ExtremeWQCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/extreme/ExtremeWQCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.awt.Color; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.Marker; import org.jfree.chart.plot.ValueMarker; @@ -45,7 +46,7 @@ { /** Private log. */ private static Logger log = - Logger.getLogger(ExtremeWQCurveGenerator.class); + LogManager.getLogger(ExtremeWQCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.extreme.wq.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/DeltaWtExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -36,14 +36,15 @@ import java.util.List; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Exports fixation analysis deltaw(t) computation results to csv. */ public class DeltaWtExporter extends AbstractExporter { /** Private log. */ - private static Logger log = Logger.getLogger(DeltaWtExporter.class); + private static Logger log = LogManager.getLogger(DeltaWtExporter.class); public static final String CSV_KM_HEADER = "export.fixings.deltawt.csv.header.km";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATExport.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATExport.java Wed Mar 02 10:26:50 2022 +0100 @@ -36,7 +36,8 @@ import java.io.OutputStreamWriter; import java.io.Writer; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.NodeList; @@ -45,7 +46,7 @@ /** Private log. */ private static Logger log = - Logger.getLogger(FixATExport.class); + LogManager.getLogger(FixATExport.class); protected Function function; protected Parameters parameters;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATWriter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATWriter.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,13 +28,14 @@ import java.util.Locale; import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Export Fixation Analysis Results to AT. */ public class FixATWriter { /** Private log. */ - private static Logger log = Logger.getLogger(FixATWriter.class); + private static Logger log = LogManager.getLogger(FixATWriter.class); public static final String I18N_HEADER_KEY = "fix.export.at.header";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixChartGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixChartGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.io.OutputStream; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; /** @@ -25,7 +26,7 @@ extends XYChartGenerator { /** Private log. */ - private static Logger log = Logger.getLogger(FixChartGenerator.class); + private static Logger log = LogManager.getLogger(FixChartGenerator.class); public static final Double INVALID_KM = Double.valueOf(-1d); public static final String CURRENT_KM = "currentKm";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,7 +33,8 @@ import java.util.Locale; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.annotations.XYTextAnnotation; import org.jfree.data.time.RegularTimePeriod; import org.jfree.data.time.FixedMillisecond; @@ -55,7 +56,7 @@ { /** Private log. */ private static Logger log = - Logger.getLogger(FixDeltaWtGenerator.class); + LogManager.getLogger(FixDeltaWtGenerator.class); public static final String I18N_CHART_TITLE = "chart.fix.deltawt.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.JFreeChart; import org.jfree.chart.annotations.XYTextAnnotation; import org.jfree.chart.plot.Marker; @@ -72,7 +73,7 @@ { /** Private log. */ private static Logger log = - Logger.getLogger(FixWQCurveGenerator.class); + LogManager.getLogger(FixWQCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.fixings.wq.title";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,12 +27,13 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ParametersExporter extends AbstractExporter { - private static Logger log = Logger.getLogger(ParametersExporter.class); + private static Logger log = LogManager.getLogger(ParametersExporter.class); protected List<Parameters> parametersList;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromGaugeNameInjector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromGaugeNameInjector.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.injector; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.ContextInjector; @@ -25,7 +26,7 @@ implements ContextInjector { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( KmFromGaugeNameInjector.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromGaugeNumberInjector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromGaugeNumberInjector.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.injector; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.ContextInjector; @@ -24,7 +25,7 @@ implements ContextInjector { private static Logger log = - Logger.getLogger(KmFromGaugeNumberInjector.class); + LogManager.getLogger(KmFromGaugeNumberInjector.class); @Override public void setup(Element cfg) {
--- a/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromLocationInjector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromLocationInjector.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.injector; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.ContextInjector; @@ -23,7 +24,7 @@ implements ContextInjector { - private static Logger log = Logger.getLogger(KmFromLocationInjector.class); + private static Logger log = LogManager.getLogger(KmFromLocationInjector.class); @Override public void setup(Element cfg) {
--- a/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromRequestInjector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/injector/KmFromRequestInjector.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.injector; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.ArtifactNamespaceContext; import org.dive4elements.artifacts.CallContext; @@ -25,7 +26,7 @@ public class KmFromRequestInjector implements ContextInjector { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( KmFromRequestInjector.class); public static final String XPATH_CHART_CURRENTKM =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/injector/PNPInjector.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/injector/PNPInjector.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.injector; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.ContextInjector; @@ -26,7 +27,7 @@ implements ContextInjector { - private Logger log = Logger.getLogger(PNPInjector.class); + private Logger log = LogManager.getLogger(PNPInjector.class); @Override public void setup(Element cfg) { // TODO Auto-generated method stub
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.util.Collections; import java.text.DateFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.commons.lang.StringUtils; import net.sf.jasperreports.engine.JasperExportManager; @@ -50,7 +51,7 @@ /** Private log. */ private static Logger log = - Logger.getLogger(BedDifferenceExporter.class); + LogManager.getLogger(BedDifferenceExporter.class); private static final String CSV_HEADER_KM = "export.minfo.beddifference.km";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import au.com.bytecode.opencsv.CSVWriter; import org.dive4elements.river.artifacts.model.CalculationResult; @@ -32,7 +33,7 @@ extends AbstractExporter { /** Private log. */ - private static Logger log = Logger.getLogger(BedQualityExporter.class); + private static Logger log = LogManager.getLogger(BedQualityExporter.class); private static final String CSV_HEADER_KM = "export.minfo.bedquality.km";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.text.NumberFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.access.SedimentLoadAccess; import org.dive4elements.river.artifacts.model.CalculationResult; @@ -40,7 +41,7 @@ extends AbstractExporter { /** Private log. */ - private static Logger log = Logger.getLogger(SedimentLoadExporter.class); + private static Logger log = LogManager.getLogger(SedimentLoadExporter.class); // i18n keys. public static final String CSV_KM =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/AnnotationProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; @@ -26,7 +27,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(AnnotationProcessor.class); + LogManager.getLogger(AnnotationProcessor.class); @Override public void doOut(
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/AreaProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/AreaProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -9,7 +9,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -31,7 +32,7 @@ public class AreaProcessor extends DefaultProcessor { - private static final Logger log = Logger.getLogger(AreaProcessor.class); + private static final Logger log = LogManager.getLogger(AreaProcessor.class); protected XYSeries getSeries( String seriesName,
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -27,7 +28,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(BedDiffHeightYearProcessor.class); + LogManager.getLogger(BedDiffHeightYearProcessor.class); protected static double GAP_TOLERANCE = 0.101d;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.FacetTypes; @@ -24,7 +25,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(BedDiffYearProcessor.class); + LogManager.getLogger(BedDiffYearProcessor.class); protected static double GAP_TOLERANCE = 0.101d;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -30,7 +31,7 @@ public class BedHeightProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(BedHeightProcessor.class); + LogManager.getLogger(BedHeightProcessor.class); public static final String I18N_AXIS_LABEL = "chart.bedheight_middle.section.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDensityProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDensityProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -25,7 +26,7 @@ public class BedQualityDensityProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(BedQualityDensityProcessor.class); + LogManager.getLogger(BedQualityDensityProcessor.class); public static final String I18N_AXIS_LABEL = "chart.bedquality.yaxis.label.density";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDiameterProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDiameterProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -25,7 +26,7 @@ public class BedQualityDiameterProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(BedQualityDiameterProcessor.class); + LogManager.getLogger(BedQualityDiameterProcessor.class); public static final String I18N_AXIS_LABEL = "chart.bedquality.yaxis.label.diameter";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityPorosityProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityPorosityProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.FacetTypes; @@ -22,7 +23,7 @@ public class BedQualityPorosityProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(BedQualityPorosityProcessor.class); + LogManager.getLogger(BedQualityPorosityProcessor.class); public static final String I18N_AXIS_LABEL_DEFAULT = "Porosität [%]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.Map; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -24,7 +25,7 @@ public class BedWidthProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(BedWidthProcessor.class); + LogManager.getLogger(BedWidthProcessor.class); public static final String I18N_AXIS_LABEL_DEFAULT = "Breite [m]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/DeltaWProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/DeltaWProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.awt.BasicStroke; import java.awt.Color; @@ -35,7 +36,7 @@ * historic reason for this is that they have in common that they * work on deltaW data from the fixing analysis. */ - private static final Logger log = Logger.getLogger(DeltaWProcessor.class); + private static final Logger log = LogManager.getLogger(DeltaWProcessor.class); public static final String I18N_DW_YAXIS_LABEL_DEFAULT = "delta W [cm]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; @@ -31,7 +32,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(DischargeProcessor.class); + LogManager.getLogger(DischargeProcessor.class); /** Station for which the diagram is shown. */ private double km;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDeltaWAProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDeltaWAProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -26,7 +27,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(FixDeltaWAProcessor.class); + LogManager.getLogger(FixDeltaWAProcessor.class); public static final String I18N_AXIS_LABEL = "chart.beddifference.height.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDeltaWProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDeltaWProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -26,7 +27,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(FixDeltaWProcessor.class); + LogManager.getLogger(FixDeltaWProcessor.class); public static final String I18N_AXIS_LABEL = "chart.beddifference.yaxis.label.diff";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDerivedProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixDerivedProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; @@ -31,7 +32,7 @@ implements FacetTypes { - private static Logger log = Logger.getLogger(FixDerivedProcessor.class); + private static Logger log = LogManager.getLogger(FixDerivedProcessor.class); private String yAxisLabel = "";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.D4EArtifact; @@ -52,7 +53,7 @@ implements FacetTypes { - private static Logger log = Logger.getLogger(FixWQProcessor.class); + private static Logger log = LogManager.getLogger(FixWQProcessor.class); private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FlowVelocityProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FlowVelocityProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; @@ -26,7 +27,7 @@ public class FlowVelocityProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(FlowVelocityProcessor.class); + LogManager.getLogger(FlowVelocityProcessor.class); public static final String I18N_AXIS_LABEL = "chart.flow_velocity.section.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/ManualPointsProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/ManualPointsProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -9,7 +9,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.ArrayList; @@ -31,7 +32,7 @@ public class ManualPointsProcessor extends DefaultProcessor { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( ManualPointsProcessor.class); @Override
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/MiddleBedHeightProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/MiddleBedHeightProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; @@ -27,7 +28,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(MiddleBedHeightProcessor.class); + LogManager.getLogger(MiddleBedHeightProcessor.class); public static final String I18N_AXIS_LABEL = "chart.bedheight_middle.section.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/MiscDischargeProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/MiscDischargeProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -41,7 +42,7 @@ extends DefaultProcessor implements FacetTypes { private final static Logger log = - Logger.getLogger(MiscDischargeProcessor.class); + LogManager.getLogger(MiscDischargeProcessor.class); /** Station for which the diagram is shown. */ private double km;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -39,7 +40,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(QOutProcessor.class); + LogManager.getLogger(QOutProcessor.class); @Override public void doOut(
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SQRelationProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SQRelationProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.ArrayList; import java.text.DateFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; @@ -39,7 +40,7 @@ ""; private final static Logger log = - Logger.getLogger(SQRelationProcessor.class); + LogManager.getLogger(SQRelationProcessor.class); @Override public void doOut(
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentDensityProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentDensityProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -28,7 +29,7 @@ /** Private log. */ private final static Logger log = - Logger.getLogger(SedimentDensityProcessor.class); + LogManager.getLogger(SedimentDensityProcessor.class); public static final String I18N_AXIS_LABEL_DEFAULT = "Sedimentdichte [t/m^3]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -22,7 +23,7 @@ public class SedimentLoadLSProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(SedimentLoadProcessor.class); + LogManager.getLogger(SedimentLoadProcessor.class); @Override public void doOut(
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import gnu.trove.TDoubleArrayList; @@ -30,7 +31,7 @@ public class SedimentLoadProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(SedimentLoadProcessor.class); + LogManager.getLogger(SedimentLoadProcessor.class); private static final double EPS = 1e-4;
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadTAProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadTAProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,14 +8,15 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.exports.DiagramGenerator; public class SedimentLoadTAProcessor extends SedimentLoadProcessor{ private final static Logger log = - Logger.getLogger(SedimentLoadTAProcessor.class); + LogManager.getLogger(SedimentLoadTAProcessor.class); public static final String I18N_YAXIS_LABEL = "chart.sedimentload.ls.yaxis.label.tpera";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/ShearStressProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/ShearStressProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -24,7 +25,7 @@ public class ShearStressProcessor extends DefaultProcessor { private final static Logger log = - Logger.getLogger(ShearStressProcessor.class); + LogManager.getLogger(ShearStressProcessor.class); public static final String I18N_AXIS_LABEL = "chart.flow_velocity.section.yaxis.second.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.exports.process; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.data.xy.XYSeries; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; @@ -35,7 +36,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(WOutProcessor.class); + LogManager.getLogger(WOutProcessor.class); public static final String I18N_AXIS_LABEL = "chart.longitudinal.section.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Wed Mar 02 10:26:50 2022 +0100 @@ -49,7 +49,8 @@ import org.dive4elements.artifacts.common.utils.Config; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> @@ -58,7 +59,7 @@ /** Private log. */ private static final Logger log = - Logger.getLogger(SQRelationExporter.class); + LogManager.getLogger(SQRelationExporter.class); public static final String INFO_COEFF_A = "export.sqrelation.csv.info.coeff.a";
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/AnnotationHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/AnnotationHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -32,11 +32,12 @@ import org.dive4elements.river.exports.LegendSection; import org.dive4elements.river.exports.ChartArea; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Annotation helper class, handles plotting of annotations. */ public class AnnotationHelper { - private static final Logger log = Logger.getLogger(AnnotationHelper.class); + private static final Logger log = LogManager.getLogger(AnnotationHelper.class); protected static float ANNOTATIONS_AXIS_OFFSET = 0.02f;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/AxisDataset.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/AxisDataset.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,14 +18,15 @@ import org.jfree.data.xy.XYSeriesCollection; import org.jfree.data.time.TimeSeriesCollection; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Axis datasets. */ public class AxisDataset { - private static Logger log = Logger.getLogger(AxisDataset.class); + private static Logger log = LogManager.getLogger(AxisDataset.class); /** Symbolic integer, but also coding the priority (0 goes first). */ protected int axisSymbol;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/EnhancedLineAndShapeRenderer.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/EnhancedLineAndShapeRenderer.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.entity.EntityCollection; import org.jfree.chart.plot.CrosshairState; @@ -46,7 +47,7 @@ /** Own log. */ private static final Logger log = - Logger.getLogger(EnhancedLineAndShapeRenderer.class); + LogManager.getLogger(EnhancedLineAndShapeRenderer.class); protected BooleanList isMinimumShapeVisible; protected BooleanList isMaximumShapeVisible;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/JFreeUtil.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/JFreeUtil.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Iterator; import java.util.Random; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.entity.ChartEntity; import org.jfree.chart.entity.EntityCollection; @@ -22,7 +23,7 @@ public class JFreeUtil { - private static final Logger log = Logger.getLogger(JFreeUtil.class); + private static final Logger log = LogManager.getLogger(JFreeUtil.class); /** Do not instantiate. */ private JFreeUtil() {
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/StableXYDifferenceRenderer.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/StableXYDifferenceRenderer.java Wed Mar 02 10:26:50 2022 +0100 @@ -133,7 +133,8 @@ import java.text.NumberFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * A renderer for an {@link XYPlot} that highlights the differences between two @@ -147,7 +148,7 @@ public class StableXYDifferenceRenderer extends AbstractXYItemRenderer implements XYItemRenderer, PublicCloneable { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( StableXYDifferenceRenderer.class); public static final int CALCULATE_POSITIVE_AREA = 1;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/StyledTimeSeries.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/StyledTimeSeries.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.jfree; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.themes.ThemeDocument; import org.jfree.data.time.TimeSeries; @@ -20,7 +21,7 @@ public class StyledTimeSeries extends TimeSeries implements StyledSeries { private static final Logger log = - Logger.getLogger(StyledTimeSeries.class); + LogManager.getLogger(StyledTimeSeries.class); protected Style style;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/StyledXYSeries.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/StyledXYSeries.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.River; @@ -34,7 +35,7 @@ extends XYSeries implements StyledSeries, HasLabel, XYMetaDataset { - private static final Logger log = Logger.getLogger(StyledXYSeries.class); + private static final Logger log = LogManager.getLogger(StyledXYSeries.class); protected Style style;
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.awt.Shape; import java.awt.geom.Ellipse2D; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; @@ -25,7 +26,7 @@ */ public class XYStyle implements Style { - private static Logger log = Logger.getLogger(XYStyle.class); + private static Logger log = LogManager.getLogger(XYStyle.class); protected ThemeDocument theme;
--- a/artifacts/src/main/java/org/dive4elements/river/themes/TextStyle.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/themes/TextStyle.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,12 +13,13 @@ import java.awt.Color; import java.awt.Font; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jfree.chart.annotations.XYTextAnnotation; public class TextStyle { @SuppressWarnings("unused") - private static Logger log = Logger.getLogger(TextStyle.class); + private static Logger log = LogManager.getLogger(TextStyle.class); protected Color textColor; protected Font font;
--- a/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.model.MapserverStyle; import org.dive4elements.river.artifacts.model.MapserverStyle.Clazz; @@ -27,7 +28,7 @@ public class ThemeDocument { - private static Logger log = Logger.getLogger(ThemeDocument.class); + private static Logger log = LogManager.getLogger(ThemeDocument.class); private static final String MSG_ISOBATH_CLASS = "floodmap.isobath.class";
--- a/artifacts/src/main/java/org/dive4elements/river/themes/ThemeFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/themes/ThemeFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -34,7 +35,7 @@ */ public class ThemeFactory { - private static Logger log = Logger.getLogger(ThemeFactory.class); + private static Logger log = LogManager.getLogger(ThemeFactory.class); /** Trivial, hidden constructor. */ private ThemeFactory() {
--- a/artifacts/src/main/java/org/dive4elements/river/themes/ThemeMapping.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/themes/ThemeMapping.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.themes; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.io.Serializable; import java.util.regex.Matcher; @@ -22,7 +23,7 @@ public class ThemeMapping implements Serializable { /** The log that is used in this class */ - private static Logger log = Logger.getLogger(ThemeMapping.class); + private static Logger log = LogManager.getLogger(ThemeMapping.class); /** Name from which to map. */ protected String from;
--- a/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.velocity.Template; import org.geotools.data.shapefile.ShpFiles; import org.geotools.data.shapefile.shp.ShapefileHeader; @@ -33,7 +34,7 @@ public class ArtifactMapfileGenerator extends MapfileGenerator { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( ArtifactMapfileGenerator.class); public static final String FLOODMAP_UESK_KEY =
--- a/artifacts/src/main/java/org/dive4elements/river/utils/BatchLoader.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/BatchLoader.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SQLQuery; import org.hibernate.Session; @@ -27,7 +28,7 @@ */ public abstract class BatchLoader<T> { - private static Logger log = Logger.getLogger(BatchLoader.class); + private static Logger log = LogManager.getLogger(BatchLoader.class); public static final int BATCH_SIZE = 100;
--- a/artifacts/src/main/java/org/dive4elements/river/utils/DoubleUtil.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/DoubleUtil.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,13 +22,14 @@ import java.util.Arrays; import java.util.Comparator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Utils to deal with Double precision values. */ public class DoubleUtil { /** Private log. */ - private static Logger log = Logger.getLogger(DoubleUtil.class); + private static Logger log = LogManager.getLogger(DoubleUtil.class); public static final double DEFAULT_STEP_PRECISION = 1e6;
--- a/artifacts/src/main/java/org/dive4elements/river/utils/GeometryUtils.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/GeometryUtils.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.geotools.data.DataStoreFactorySpi; import org.geotools.data.DefaultTransaction; import org.geotools.data.FeatureWriter; @@ -49,7 +50,7 @@ public class GeometryUtils { - private static final Logger log = Logger.getLogger(GeometryUtils.class); + private static final Logger log = LogManager.getLogger(GeometryUtils.class); public static final String PREFIX_EPSG = "EPSG:";
--- a/artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.net.URI; import java.net.URISyntaxException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.impl.SessionFactoryImpl; import org.dive4elements.river.backend.SessionFactoryProvider; @@ -19,7 +20,7 @@ public class MapUtils { - private static final Logger log = Logger.getLogger(MapUtils.class); + private static final Logger log = LogManager.getLogger(MapUtils.class); private static final String JDBC_SCHEME = "^jdbc:";
--- a/artifacts/src/main/java/org/dive4elements/river/utils/MapfileGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/MapfileGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; @@ -53,7 +54,7 @@ public static final String MS_LAYER_PREFIX = "ms_layer-"; public static final String MS_USERSHAPE_PREFIX = "user-"; - private static Logger log = Logger.getLogger(MapfileGenerator.class); + private static Logger log = LogManager.getLogger(MapfileGenerator.class); private File shapefileDirectory;
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,7 +27,8 @@ import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.velocity.Template; import org.hibernate.HibernateException; @@ -58,7 +59,7 @@ public static final Pattern DB_PSQL_URL_PATTERN = Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z0-9]+)"); - private static Logger log = Logger.getLogger(RiverMapfileGenerator.class); + private static Logger log = LogManager.getLogger(RiverMapfileGenerator.class); /** * Generate river axis mapfile.
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Wed Mar 02 10:26:50 2022 +0100 @@ -42,7 +42,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SessionFactory; import org.hibernate.impl.SessionFactoryImpl; import org.w3c.dom.Document; @@ -59,7 +60,7 @@ public class RiverUtils { /** The log that is used in this utility. */ - private static Logger log = Logger.getLogger(RiverUtils.class); + private static Logger log = LogManager.getLogger(RiverUtils.class); /** * Enum that represents the 5 possible WQ modes in FLYS. The 5 values are
--- a/artifacts/src/main/java/org/dive4elements/river/utils/UniqueDateFormatter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/UniqueDateFormatter.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,11 +14,12 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class UniqueDateFormatter { - private static Logger log = Logger.getLogger(UniqueDateFormatter.class); + private static Logger log = LogManager.getLogger(UniqueDateFormatter.class); private DateFormat df; private DateFormat lf;
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/FacetCreator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/FacetCreator.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.vividsolutions.jts.geom.Envelope; @@ -52,7 +53,7 @@ protected String stateId; - private static Logger log = Logger.getLogger(FacetCreator.class); + private static Logger log = LogManager.getLogger(FacetCreator.class); public FacetCreator(
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/JobObserver.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/JobObserver.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.CalculationMessage; import org.dive4elements.river.artifacts.model.map.WSPLGENJob; @@ -23,7 +24,7 @@ public class JobObserver extends Thread { - private static Logger log = Logger.getLogger(JobObserver.class); + private static Logger log = LogManager.getLogger(JobObserver.class); public static final String WSPLGEN_ENCODING =
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/ProblemObserver.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/ProblemObserver.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.artifacts.model.map.WSPLGENCalculation; import org.dive4elements.river.artifacts.model.map.WSPLGENJob; @@ -19,7 +20,7 @@ public class ProblemObserver extends JobObserver { - private static Logger log = Logger.getLogger(ProblemObserver.class); + private static Logger log = LogManager.getLogger(ProblemObserver.class); public static final Pattern WSPLGEN_ERROR_START = Pattern.compile(
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/Scheduler.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/Scheduler.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledThreadPoolExecutor; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.map.WSPLGENJob; @@ -50,7 +51,7 @@ private static Scheduler INSTANCE; - private static final Logger log = Logger.getLogger(Scheduler.class); + private static final Logger log = LogManager.getLogger(Scheduler.class);
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/WSPLGENCallable.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/WSPLGENCallable.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.io.IOException; import java.util.concurrent.Callable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -32,7 +33,7 @@ System.getProperty("wsplgen.bin.path"); - private Logger log = Logger.getLogger(WSPLGENCallable.class); + private Logger log = LogManager.getLogger(WSPLGENCallable.class); private Process process;
--- a/artifacts/src/main/java/org/dive4elements/river/wsplgen/WSPLGENFuture.java Fri Feb 25 17:17:56 2022 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/wsplgen/WSPLGENFuture.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.concurrent.FutureTask; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -22,7 +23,7 @@ */ public class WSPLGENFuture extends FutureTask { - private static final Logger log = Logger.getLogger(WSPLGENFuture.class); + private static final Logger log = LogManager.getLogger(WSPLGENFuture.class); protected WSPLGENCallable wsplgenCallable;
--- a/backend/contrib/import_river.sh Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/contrib/import_river.sh Wed Mar 02 10:26:50 2022 +0100 @@ -151,14 +151,25 @@ LOG_DIR=${LOG}/`basename $GEW_FILE .gew`-$DATE mkdir -p ${LOG_DIR} -cat > "$LOG_DIR/log4j.properties" << "EOF" -log4j.rootLogger=INFO, IMPORTER -log4j.appender.IMPORTER.layout=org.apache.log4j.PatternLayout -log4j.appender.IMPORTER.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.appender.IMPORTER=org.apache.log4j.RollingFileAppender -log4j.appender.IMPORTER.File=./import.log -log4j.appender.IMPORTER.MaxFileSize=100000KB -log4j.appender.IMPORTER.MaxBackupIndex=10 +cat > "$LOG_DIR/log4j2.xml" << "EOF" +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <RollingFile + name="RollingFile" + fileName="import.log" + filePattern="import.log.%i"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c - %m%n"/> + <SizeBasedTriggeringPolicy size="100000 KB"/> + <DefaultRolloverStrategy max="10"/> + </RollingFile> + </Appenders> + <Loggers> + <Root level="DEBUG"> + <AppenderRef ref="RollingFile"/> + </Root> + </Loggers> +</Configuration> EOF if [ "$POSTGRES" = "TRUE" ]; then @@ -186,12 +197,11 @@ LOG_FILE=${LOG_DIR}/hydro.log echo Importing Hydrological data. echo Logging into: $LOG_FILE - sed -i 's!\(log4j.appender.IMPORTER.File=\).*!\1'"$LOG_FILE"'!' \ - $LOG_DIR/log4j.properties + sed -i "s/import.log/$LOG_FILE/" $LOG_DIR/log4j2.xml java -jar \ -Xmx$MIN_MEMORY \ -server \ - -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ + -Dlog4j2.configurationFile=file://$LOG_DIR/log4j2.xml \ -Dflys.backend.user=$DBUSER \ -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \ @@ -235,12 +245,11 @@ LOG_FILE=${LOG_DIR}/morpho.log echo Importing Morphological data. echo Logging into: $LOG_FILE - sed -i 's!\(log4j.appender.IMPORTER.File=\).*!\1'"$LOG_FILE"'!' \ - $LOG_DIR/log4j.properties + sed -i "s/import.log/$LOG_FILE/" $LOG_DIR/log4j2.xml java -jar \ -Xmx$MIN_MEMORY \ -server \ - -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ + -Dlog4j2.configurationFile=file://$LOG_DIR/log4j2.xml \ -Dflys.backend.user=$DBUSER \ -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \ @@ -284,12 +293,11 @@ LOG_FILE=${LOG_DIR}/prf.log echo Importing cross section data. echo Logging into: $LOG_FILE - sed -i 's!\(log4j.appender.IMPORTER.File=\).*!\1'"$LOG_FILE"'!' \ - $LOG_DIR/log4j.properties + sed -i "s/import.log/$LOG_FILE/" $LOG_DIR/log4j2.xml java -jar \ -Xmx$MIN_MEMORY \ -server \ - -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ + -Dlog4j2.configurationFile=file://$LOG_DIR/log4j2.xml \ -Dflys.backend.user=$DBUSER \ -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \
--- a/backend/contrib/run_hydr_morph.sh Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/contrib/run_hydr_morph.sh Wed Mar 02 10:26:50 2022 +0100 @@ -6,7 +6,7 @@ BACKEND_HOST="czech-republic.atlas.intevation.de" BACKEND_PORT="1521" BACKEND_NAME="XE" -LOG4J_CONFIG="conf/log4j.properties" +LOG4J_CONFIG="conf/log4j2.xml" JAR="bin/river-backend-1.0-SNAPSHOT*.jar" ##################################################################### @@ -72,7 +72,7 @@ exec java -jar \ -Xmx$MIN_MEMORY \ -server \ - -Dlog4j.configuration=file://`readlink -f $LOG4J_CONFIG` \ + -Dlog4j2.configurationFile=file://`readlink -f $LOG4J_CONFIG` \ -Dflys.backend.importer.infogew.file=$INFO_GEW \ -Dflys.backend.main.value.types=$IMPORTER_MAINVALUE_TYPES \ -Dflys.backend.importer.annotation.types=$IMPORTER_ANNOTATION_TYPES \
--- a/backend/doc/conf/log4j.properties Fri Feb 25 17:17:56 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -log4j.rootLogger=DEBUG, IMPORTER -log4j.appender.IMPORTER.layout=org.apache.log4j.PatternLayout -log4j.appender.IMPORTER.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.appender.IMPORTER=org.apache.log4j.RollingFileAppender -log4j.appender.IMPORTER.File=./import.log -log4j.appender.IMPORTER.MaxFileSize=100000KB -log4j.appender.IMPORTER.MaxBackupIndex=10
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/backend/doc/conf/log4j2.xml Wed Mar 02 10:26:50 2022 +0100 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <RollingFile + name="RollingFile" + fileName="import.log" + filePattern="import.log.%i"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c - %m%n"/> + <SizeBasedTriggeringPolicy size="100000 KB"/> + <DefaultRolloverStrategy max="10"/> + </RollingFile> + </Appenders> + <Loggers> + <Root level="DEBUG"> + <AppenderRef ref="RollingFile"/> + </Root> + </Loggers> +</Configuration>
--- a/backend/doc/documentation/de/importer-hydr-morph.tex Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/doc/documentation/de/importer-hydr-morph.tex Wed Mar 02 10:26:50 2022 +0100 @@ -377,14 +377,14 @@ von Informationen. Dazu ist es notwendig eine entsprechende Konfiguration beim Start anzugeben. \textit{LOG4J\_CONFIG} verweist in diesem Fall auf eine externe Datei zur Konfiguration von Log4J. Im Standardfall wird die Datei -\textit{conf/log4j.properties} verwendet, welche eine sinnvolle Standardkonfiguration +\textit{conf/log4j2.xml} verwendet, welche eine sinnvolle Standardkonfiguration enthält. Sollten Sie diese Konfiguration verwenden, wird beim Import eine Log-Datei namens \textit{import.log} erstellt, die maximal 100 MB groß werden kann. Sollte die Log-Datei größer als 100 MB anwachsen, wird die aktuelle Datei nach \textit{import.log.1} umbenannt und eine neue Datei \textit{import.log} wird begonnen. Maximal werden 10 Log-Dateien gespeichert. Für weitere Details zu Log4J siehe Online Dokumentation unter -\href{http://logging.apache.org/log4j/1.2/}{http://logging.apache.org/log4j/1.2/} +\href{http://logging.apache.org/log4j}{http://logging.apache.org/log4j} \textbf{IMPORTER\_MAINVALUE\_TYPES} @@ -939,5 +939,5 @@ Alternativ können auch in diesem Skript einige Variablen (\textit{DEFAULT\_*}) angepasst werden. Das Logging kann in diesem Fall nicht wie oben beschrieben -über \textit{conf/log4j.properties} angepasst werden, da hier +über \textit{conf/log4j2.xml} angepasst werden, da hier mehrere Log-Dateien geschrieben werden müssen.
--- a/backend/pom-oracle.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/pom-oracle.xml Wed Mar 02 10:26:50 2022 +0100 @@ -140,9 +140,15 @@ <version>1.0.1.Final</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId>
--- a/backend/pom.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/pom.xml Wed Mar 02 10:26:50 2022 +0100 @@ -140,9 +140,15 @@ <version>1.0.1.Final</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId>
--- a/backend/src/main/java/org/dive4elements/river/backend/SedDBSessionHolder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/SedDBSessionHolder.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.backend; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -16,7 +17,7 @@ public class SedDBSessionHolder { private static Logger log = - Logger.getLogger(SedDBSessionHolder.class); + LogManager.getLogger(SedDBSessionHolder.class); public static final ThreadLocal<Session> HOLDER = new ThreadLocal<Session>() {
--- a/backend/src/main/java/org/dive4elements/river/backend/SessionFactoryProvider.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/SessionFactoryProvider.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.Properties; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.SessionFactory; @@ -21,7 +22,7 @@ public final class SessionFactoryProvider { - private static Logger log = Logger.getLogger(SessionFactoryProvider.class); + private static Logger log = LogManager.getLogger(SessionFactoryProvider.class); //public static final boolean ENABLE_JMX = // Boolean.getBoolean("flys.backend.enablejmx");
--- a/backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.backend; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -17,7 +18,7 @@ public class SessionHolder { private static Logger log = - Logger.getLogger(SessionHolder.class); + LogManager.getLogger(SessionHolder.class); public static final ThreadLocal<Session> HOLDER = new ThreadLocal<Session>() {
--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java Wed Mar 02 10:26:50 2022 +0100 @@ -34,7 +34,8 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.dbcp2.BasicDataSourceFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.HibernateException; @@ -75,7 +76,7 @@ public class DBCPConnectionProvider implements ConnectionProvider { - private static Logger log = Logger.getLogger(DBCPConnectionProvider.class); + private static Logger log = LogManager.getLogger(DBCPConnectionProvider.class); private static final String PREFIX = "hibernate.dbcp.";
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -25,7 +26,7 @@ public class ImportBedHeight { - private static Logger log = Logger.getLogger(ImportBedHeight.class); + private static Logger log = LogManager.getLogger(ImportBedHeight.class); protected Integer year;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightType.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightType.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -21,7 +22,7 @@ public class ImportBedHeightType { private static final Logger log = - Logger.getLogger(ImportBedHeightType.class); + LogManager.getLogger(ImportBedHeightType.class); protected String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -22,7 +23,7 @@ public class ImportBedHeightValue { private static final Logger log = - Logger.getLogger(ImportBedHeightValue.class); + LogManager.getLogger(ImportBedHeightValue.class); protected ImportBedHeight bedHeight;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportCrossSection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportCrossSection.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,12 +17,13 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** CrossSection to be imported, holds list of ImportCrossSectionLines. */ public class ImportCrossSection { - private static Logger log = Logger.getLogger(ImportCrossSection.class); + private static Logger log = LogManager.getLogger(ImportCrossSection.class); protected ImportRiver river; protected String description;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportDepth.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportDepth.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -22,7 +23,7 @@ public class ImportDepth { - private static Logger log = Logger.getLogger(ImportDepth.class); + private static Logger log = LogManager.getLogger(ImportDepth.class); protected Depth peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTable.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTable.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,11 +18,12 @@ import org.dive4elements.river.model.Gauge; import org.dive4elements.river.model.TimeInterval; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ImportDischargeTable { - private static Logger log = Logger.getLogger(ImportDischargeTable.class); + private static Logger log = LogManager.getLogger(ImportDischargeTable.class); protected DischargeTable peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportDischargeZone.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportDischargeZone.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.math.BigDecimal; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -23,7 +24,7 @@ public class ImportDischargeZone { private static final Logger log = - Logger.getLogger(ImportDischargeZone.class); + LogManager.getLogger(ImportDischargeZone.class); private String gaugeName;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportElevationModel.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportElevationModel.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -21,7 +22,7 @@ public class ImportElevationModel { private static final Logger log = - Logger.getLogger(ImportElevationModel.class); + LogManager.getLogger(ImportElevationModel.class); protected String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurement.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -22,7 +23,7 @@ public class ImportFlowVelocityMeasurement { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(ImportFlowVelocityMeasurement.class); private String description;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurementValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurementValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -25,7 +26,7 @@ public class ImportFlowVelocityMeasurementValue { private static final Logger log = - Logger.getLogger(ImportFlowVelocityMeasurementValue.class); + LogManager.getLogger(ImportFlowVelocityMeasurementValue.class); private Date datetime;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModel.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModel.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -23,7 +24,7 @@ public class ImportFlowVelocityModel { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(ImportFlowVelocityModel.class); private String description;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportGauge.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportGauge.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,7 +25,8 @@ import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.parsers.AtFileParser; import org.dive4elements.river.importer.parsers.StaFileParser; @@ -33,7 +34,7 @@ /** Gauge not in DB. */ public class ImportGauge { - private static Logger log = Logger.getLogger(ImportGauge.class); + private static Logger log = LogManager.getLogger(ImportGauge.class); public static final String HISTORICAL_DISCHARGE_TABLES = "Histor.Abflusstafeln";
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportHYK.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportHYK.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,11 +17,12 @@ import org.hibernate.Session; import org.hibernate.Query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ImportHYK { - private static Logger log = Logger.getLogger(ImportHYK.class); + private static Logger log = LogManager.getLogger(ImportHYK.class); protected ImportRiver river; protected String description;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportLocationSystem.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportLocationSystem.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -21,7 +22,7 @@ public class ImportLocationSystem { private static final Logger log = - Logger.getLogger(ImportLocationSystem.class); + LogManager.getLogger(ImportLocationSystem.class); protected String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.dive4elements.river.model.Gauge; @@ -22,7 +23,7 @@ public class ImportMeasurementStation { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(ImportMeasurementStation.class); private MeasurementStation peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidth.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidth.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -22,7 +23,7 @@ public class ImportMorphWidth { - private static Logger log = Logger.getLogger(ImportMorphWidth.class); + private static Logger log = LogManager.getLogger(ImportMorphWidth.class); protected MorphologicalWidth peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidthValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidthValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -23,7 +24,7 @@ public class ImportMorphWidthValue { - private static Logger log = Logger.getLogger(ImportMorphWidthValue.class); + private static Logger log = LogManager.getLogger(ImportMorphWidthValue.class); protected MorphologicalWidthValue peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportPorosity.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportPorosity.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -21,7 +22,7 @@ public class ImportPorosity { - private static Logger log = Logger.getLogger(ImportPorosity.class); + private static Logger log = LogManager.getLogger(ImportPorosity.class); protected Porosity peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportPorosityValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportPorosityValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -24,7 +25,7 @@ public class ImportPorosityValue { private static final Logger log = - Logger.getLogger(ImportPorosityValue.class); + LogManager.getLogger(ImportPorosityValue.class); protected PorosityValue peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,14 +13,15 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** A range that is about to be imported. */ public class ImportRange implements Comparable<ImportRange> { /** Private log. */ - private static Logger log = Logger.getLogger(ImportRange.class); + private static Logger log = LogManager.getLogger(ImportRange.class); protected BigDecimal a; protected BigDecimal b;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Wed Mar 02 10:26:50 2022 +0100 @@ -55,7 +55,8 @@ import java.util.Set; import java.util.Iterator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -64,7 +65,7 @@ public class ImportRiver { /** Private log. */ - private static Logger log = Logger.getLogger(ImportRiver.class); + private static Logger log = LogManager.getLogger(ImportRiver.class); public static final String PEGEL_GLT = "PEGEL.GLT";
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -24,7 +25,7 @@ public class ImportSQRelation { - private static Logger log = Logger.getLogger(ImportSQRelation.class); + private static Logger log = LogManager.getLogger(ImportSQRelation.class); private ImportTimeInterval timeInterval;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelationValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelationValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.sql.SQLException; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -25,7 +26,7 @@ public class ImportSQRelationValue { - private static Logger log = Logger.getLogger(ImportSQRelationValue.class); + private static Logger log = LogManager.getLogger(ImportSQRelationValue.class); private SQRelationValue peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensity.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensity.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -21,7 +22,7 @@ public class ImportSedimentDensity { - private static Logger log = Logger.getLogger(ImportSedimentDensity.class); + private static Logger log = LogManager.getLogger(ImportSedimentDensity.class); protected SedimentDensity peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensityValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensityValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -24,7 +25,7 @@ public class ImportSedimentDensityValue { private static final Logger log = - Logger.getLogger(ImportSedimentDensityValue.class); + LogManager.getLogger(ImportSedimentDensityValue.class); protected SedimentDensityValue peer;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoadLS.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoadLS.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -25,7 +26,7 @@ public class ImportSedimentLoadLS { - private static Logger log = Logger.getLogger(ImportSedimentLoadLS.class); + private static Logger log = LogManager.getLogger(ImportSedimentLoadLS.class); private ImportGrainFraction grainFraction;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportTimeInterval.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportTimeInterval.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,11 +16,12 @@ import java.util.List; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ImportTimeInterval { - private static Logger log = Logger.getLogger(ImportTimeInterval.class); + private static Logger log = LogManager.getLogger(ImportTimeInterval.class); protected Date startTime; protected Date stopTime;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportUnit.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportUnit.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -20,7 +21,7 @@ public class ImportUnit { - private static final Logger log = Logger.getLogger(ImportUnit.class); + private static final Logger log = LogManager.getLogger(ImportUnit.class); protected String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWst.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWst.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import org.dive4elements.river.model.Wst; import org.dive4elements.river.model.River; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -22,7 +23,7 @@ /** Not (yet) db-mapped WST object. */ public class ImportWst { - private static Logger log = Logger.getLogger(ImportWst.class); + private static Logger log = LogManager.getLogger(ImportWst.class); public interface ImportWstColumnFactory { ImportWstColumn create(ImportWst iw, int position);
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,13 +22,14 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Unmapped column of a WST. */ public class ImportWstColumn { - private static Logger log = Logger.getLogger(ImportWstColumn.class); + private static Logger log = LogManager.getLogger(ImportWstColumn.class); protected ImportWst wst; protected String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,11 +14,12 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ImportWstColumnValue { - protected Logger log = Logger.getLogger(ImportWstColumnValue.class); + protected Logger log = LogManager.getLogger(ImportWstColumnValue.class); protected BigDecimal position; protected BigDecimal w;
--- a/backend/src/main/java/org/dive4elements/river/importer/Importer.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/Importer.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.sql.SQLException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Transaction; import org.hibernate.HibernateException; @@ -36,7 +37,7 @@ public class Importer { /** Private log. */ - private static final Logger log = Logger.getLogger(Importer.class); + private static final Logger log = LogManager.getLogger(Importer.class); private static final String BWASTR_ID_CSV_FILE = "BWASTR_ID.csv";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AbstractSedimentLoadParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AbstractSedimentLoadParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImporterSession; import org.dive4elements.river.importer.ImportGrainFraction; @@ -32,7 +33,7 @@ public abstract class AbstractSedimentLoadParser extends LineParser { private static final Logger log = - Logger.getLogger(AbstractSedimentLoadParser.class); + LogManager.getLogger(AbstractSedimentLoadParser.class); public static final NumberFormat nf = NumberFormat.getInstance(
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationClassifier.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationClassifier.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import java.util.regex.Pattern; import java.util.regex.Matcher; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -30,7 +31,7 @@ public class AnnotationClassifier { - private static Logger log = Logger.getLogger(AnnotationClassifier.class); + private static Logger log = LogManager.getLogger(AnnotationClassifier.class); public static final String TYPES_XPATH = "/annotation/types/type";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationsParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationsParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.FileTools; @@ -34,7 +35,7 @@ public class AnnotationsParser { - private static Logger log = Logger.getLogger(AnnotationsParser.class); + private static Logger log = LogManager.getLogger(AnnotationsParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.io.IOException; import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportDischargeTable; import org.dive4elements.river.importer.ImportDischargeTableValue; @@ -34,7 +35,7 @@ public static final String ENCODING = "ISO-8859-1"; - private static Logger log = Logger.getLogger(AtFileParser.class); + private static Logger log = LogManager.getLogger(AtFileParser.class); // regular expression from hell to find out time range public static final Pattern DATE_LINE = Pattern.compile(
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,7 +29,8 @@ import java.io.FileInputStream; import java.io.InputStreamReader; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportBedHeight; import org.dive4elements.river.importer.ImportBedHeightValue; @@ -47,7 +48,7 @@ public class BedHeightParser { private static final Logger log = - Logger.getLogger(BedHeightParser.class); + LogManager.getLogger(BedHeightParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,14 +10,15 @@ import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Parse CSV file that contains official numbers for rivers. */ public class BundesWasserStrassenParser extends LineParser { /** Private log. */ private static final Logger log = - Logger.getLogger(BundesWasserStrassenParser.class); + LogManager.getLogger(BundesWasserStrassenParser.class); /** Map from rivernames to Official numbers. */ private HashMap<String,Long> numberMap;
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.XY; @@ -32,7 +33,7 @@ public class DA50Parser extends LineParser implements CrossSectionParser { /** Private log. */ - private static Logger log = Logger.getLogger(DA50Parser.class); + private static Logger log = LogManager.getLogger(DA50Parser.class); /** The current line to which add points. */ private List<XY> currentLine;
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Wed Mar 02 10:26:50 2022 +0100 @@ -26,7 +26,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -36,7 +37,7 @@ public class DA66Parser extends LineParser implements CrossSectionParser { /** Private log. */ - private static Logger log = Logger.getLogger(DA66Parser.class); + private static Logger log = LogManager.getLogger(DA66Parser.class); private static final String HEAD_HEAD = "00"; private static final String HEAD_GEOM = "66"; // "Values"
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityMeasurementParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityMeasurementParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,11 +21,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class FlowVelocityMeasurementParser extends LineParser { private static final Logger log = - Logger.getLogger(FlowVelocityMeasurementParser.class); + LogManager.getLogger(FlowVelocityMeasurementParser.class); private static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportDischargeZone; import org.dive4elements.river.importer.ImportFlowVelocityModel; @@ -31,7 +32,7 @@ public class FlowVelocityModelParser extends LineParser { private static final Logger log = - Logger.getLogger(FlowVelocityModelParser.class); + LogManager.getLogger(FlowVelocityModelParser.class); private static final Pattern META_REGEX = Pattern.compile(".*Rechnung [unter ]*(.*) \\(Pegel (.*)\\).*");
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/HYKParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/HYKParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,11 +29,12 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class HYKParser { - private static Logger log = Logger.getLogger(HYKParser.class); + private static Logger log = LogManager.getLogger(HYKParser.class); public interface Callback { boolean hykAccept(File file);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.io.FileInputStream; import java.io.InputStreamReader; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.FileTools; @@ -31,7 +32,7 @@ /** Processes files mentioned in an info file for a river. */ public class InfoGewParser { - private static Logger log = Logger.getLogger(InfoGewParser.class); + private static Logger log = LogManager.getLogger(InfoGewParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import java.io.FileInputStream; import java.io.InputStreamReader; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -33,7 +34,7 @@ public abstract class LineParser { /** Private log. */ - private static final Logger log = Logger.getLogger(LineParser.class); + private static final Logger log = LogManager.getLogger(LineParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.MeasurementStation; @@ -38,7 +39,7 @@ public static final int MAX_COMMENT_LENGTH = 512; - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(MeasurementStationsParser.class); private List<ImportMeasurementStation> measurementStations;
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/MorphologicalWidthParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/MorphologicalWidthParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportMorphWidth; import org.dive4elements.river.importer.ImportMorphWidthValue; @@ -28,7 +29,7 @@ public class MorphologicalWidthParser extends LineParser { private static final Logger log = - Logger.getLogger(MorphologicalWidthParser.class); + LogManager.getLogger(MorphologicalWidthParser.class); public static final NumberFormat nf = NumberFormat.getInstance( DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/NameAndTimeInterval.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/NameAndTimeInterval.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,13 +12,14 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportTimeInterval; import org.dive4elements.river.backend.utils.DateGuesser; public class NameAndTimeInterval { - private static Logger log = Logger.getLogger(NameAndTimeInterval.class); + private static Logger log = LogManager.getLogger(NameAndTimeInterval.class); // TODO: To be extented. private static final Pattern MAIN_VALUE = Pattern.compile(
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/OfficialLinesConfigParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/OfficialLinesConfigParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,11 +16,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class OfficialLinesConfigParser { - private static Logger log = Logger.getLogger( + private static Logger log = LogManager.getLogger( OfficialLinesConfigParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/PRFParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/PRFParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.io.FileInputStream; import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.XY; @@ -36,7 +37,7 @@ */ public class PRFParser implements CrossSectionParser { - private static Logger log = Logger.getLogger(PRFParser.class); + private static Logger log = LogManager.getLogger(PRFParser.class); public static final String ENCODING = System.getProperty("flys.backend.prf.encoding", "ISO-8859-1");
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/PegelGltParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/PegelGltParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.FileTools; @@ -29,7 +30,7 @@ public class PegelGltParser { - private static Logger log = Logger.getLogger(PegelGltParser.class); + private static Logger log = LogManager.getLogger(PegelGltParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,12 +28,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class PorosityParser extends LineParser { private static final Logger log = - Logger.getLogger(PorosityParser.class); + LogManager.getLogger(PorosityParser.class); public static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.model.River; import org.dive4elements.river.model.MeasurementStation; @@ -32,7 +33,7 @@ public class SQRelationParser extends LineParser { private static final Logger log = - Logger.getLogger(SQRelationParser.class); + LogManager.getLogger(SQRelationParser.class); private static final Pattern TIMERANGE_REGEX = Pattern.compile(".*Zeitraum.*\\s(\\w*)-(\\w*).*");
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentDensityParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentDensityParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -26,12 +26,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SedimentDensityParser extends LineParser { private static final Logger log = - Logger.getLogger(SedimentDensityParser.class); + LogManager.getLogger(SedimentDensityParser.class); public static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportSedimentLoadLS; import org.dive4elements.river.importer.ImportSedimentLoadLSValue; @@ -26,7 +27,7 @@ public class SedimentLoadLSParser extends AbstractSedimentLoadParser { private static final Logger log = - Logger.getLogger(SedimentLoadLSParser.class); + LogManager.getLogger(SedimentLoadLSParser.class); public static final Pattern META_UNIT =
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImporterSession; import org.dive4elements.river.importer.ImportSedimentLoad; @@ -25,7 +26,7 @@ /** Parses sediment load longitudinal section files. */ public class SedimentLoadParser extends AbstractSedimentLoadParser { private static final Logger log = - Logger.getLogger(SedimentLoadParser.class); + LogManager.getLogger(SedimentLoadParser.class); public static final String GRAINFRACTION_NAME_SUSP = "suspended_sediment";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import java.util.HashMap; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportMainValueType; import org.dive4elements.river.importer.ImportMainValue; @@ -32,7 +33,7 @@ public class StaFileParser { - private static Logger log = Logger.getLogger(StaFileParser.class); + private static Logger log = LogManager.getLogger(StaFileParser.class); public static final String ENCODING = "ISO-8859-1";
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,7 +27,8 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -37,7 +38,7 @@ public class W80CSVParser extends LineParser implements CrossSectionParser { /** Private log. */ - private static Logger log = Logger.getLogger(W80CSVParser.class); + private static Logger log = LogManager.getLogger(W80CSVParser.class); /** The current line to which add points. */
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,7 +27,8 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** @@ -37,7 +38,7 @@ public class W80Parser extends LineParser implements CrossSectionParser { /** Private log. */ - private static Logger log = Logger.getLogger(W80Parser.class); + private static Logger log = LogManager.getLogger(W80Parser.class); /** The current line to which add points. */
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportTimeInterval; import org.dive4elements.river.importer.ImportUnit; @@ -36,7 +37,7 @@ public class WaterlevelDifferencesParser extends LineParser { private static final Logger log = - Logger.getLogger(WaterlevelDifferencesParser.class); + LogManager.getLogger(WaterlevelDifferencesParser.class); private static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.importer.ImportTimeInterval; import org.dive4elements.river.importer.ImportUnit; @@ -40,7 +41,7 @@ */ public class WaterlevelParser extends LineParser { - private static final Logger log = Logger.getLogger(WaterlevelParser.class); + private static final Logger log = LogManager.getLogger(WaterlevelParser.class); private static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import java.text.NumberFormat; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.utils.StringUtil; import org.dive4elements.river.backend.utils.DateGuesser; @@ -39,7 +40,7 @@ public class WstParser { - private static Logger log = Logger.getLogger(WstParser.class); + private static Logger log = LogManager.getLogger(WstParser.class); public static final String COLUMN_BEZ_TEXT = "column-bez-text"; public static final String COLUMN_BEZ_BREITE = "column-bez-breite";
--- a/backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import javax.persistence.SequenceGenerator; import javax.persistence.GenerationType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -32,7 +33,7 @@ public class BedHeightType implements Serializable { - private static Logger log = Logger.getLogger(BedHeightType.class); + private static Logger log = LogManager.getLogger(BedHeightType.class); private Integer id; private String name;
--- a/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.Query; @@ -36,7 +37,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(BedHeightValue.class); + LogManager.getLogger(BedHeightValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Wed Mar 02 10:26:50 2022 +0100 @@ -38,7 +38,8 @@ import org.dive4elements.river.backend.SessionHolder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @Table(name = "cross_sections") @@ -46,7 +47,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(CrossSection.class); + LogManager.getLogger(CrossSection.class); public static final MathContext PRECISION = new MathContext(6);
--- a/backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,14 +28,15 @@ import javax.persistence.OneToMany; import javax.persistence.JoinColumn; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @Table(name = "cross_section_lines") public class CrossSectionLine implements Serializable { - private static Logger log = Logger.getLogger(CrossSectionLine.class); + private static Logger log = LogManager.getLogger(CrossSectionLine.class); public static final double EPSILON = 1e-4;
--- a/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,7 +25,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.SessionHolder; @@ -35,7 +36,7 @@ public class DischargeZone implements Serializable { - private static Logger log = Logger.getLogger(DischargeZone.class); + private static Logger log = LogManager.getLogger(DischargeZone.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @@ -28,7 +29,7 @@ public class ElevationModel implements Serializable { - private static Logger log = Logger.getLogger(ElevationModel.class); + private static Logger log = LogManager.getLogger(ElevationModel.class); protected Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import javax.persistence.OneToOne; import javax.persistence.OneToMany; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @@ -31,7 +32,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(FlowVelocityMeasurement.class); + LogManager.getLogger(FlowVelocityMeasurement.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** Measured Flow Velocities. */ @@ -32,7 +33,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(FlowVelocityMeasurementValue.class); + LogManager.getLogger(FlowVelocityMeasurementValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Query; import org.hibernate.Session; @@ -35,7 +36,7 @@ public class FlowVelocityModel implements Serializable { - private static Logger log = Logger.getLogger(FlowVelocityModel.class); + private static Logger log = LogManager.getLogger(FlowVelocityModel.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,7 +25,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.SessionHolder; @@ -36,7 +37,7 @@ implements Serializable { private static Logger log = - Logger.getLogger(FlowVelocityModelValue.class); + LogManager.getLogger(FlowVelocityModelValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/Gauge.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/Gauge.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,7 +28,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.backend.SessionHolder; @@ -38,7 +39,7 @@ public class Gauge implements Serializable, Comparable<Gauge> { - private static final Logger log = Logger.getLogger(Gauge.class); + private static final Logger log = LogManager.getLogger(Gauge.class); public static final int MASTER_DISCHARGE_TABLE = 0;
--- a/backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import javax.persistence.SequenceGenerator; import javax.persistence.GenerationType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @@ -36,7 +37,7 @@ public static final String UNKNOWN = "unknown"; - private static Logger log = Logger.getLogger(GrainFraction.class); + private static Logger log = LogManager.getLogger(GrainFraction.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,14 +29,15 @@ import org.dive4elements.river.backend.SessionHolder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import static org.dive4elements.river.backend.utils.EpsilonComparator.CMP; @Entity @Table(name = "measurement_station") public class MeasurementStation { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( MeasurementStation.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/River.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/River.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,14 +33,15 @@ import org.hibernate.Session; import org.hibernate.annotations.Type; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @Table(name = "rivers") public class River implements Serializable { - private static Logger log = Logger.getLogger(River.class); + private static Logger log = LogManager.getLogger(River.class); public static final MathContext PRECISION = new MathContext(6);
--- a/backend/src/main/java/org/dive4elements/river/model/RiverAxis.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/RiverAxis.java Wed Mar 02 10:26:50 2022 +0100 @@ -29,7 +29,8 @@ import org.hibernate.annotations.Type; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * A river has one axis that is used for calculation. @@ -41,7 +42,7 @@ public class RiverAxis implements Serializable { - private static Logger log = Logger.getLogger(RiverAxis.class); + private static Logger log = LogManager.getLogger(RiverAxis.class); private Integer id; private AxisKind kind;
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; @Entity @@ -28,7 +29,7 @@ public class SedimentLoadLSValue implements Serializable { - private static Logger log = Logger.getLogger(SedimentLoadLSValue.class); + private static Logger log = LogManager.getLogger(SedimentLoadLSValue.class); private Integer id;
--- a/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Feb 25 17:17:56 2022 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/Wst.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import javax.persistence.OneToOne; import javax.persistence.OneToMany; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.Session; import org.hibernate.SQLQuery; @@ -39,7 +40,7 @@ public class Wst implements Serializable { - private static Logger log = Logger.getLogger(Wst.class); + private static Logger log = LogManager.getLogger(Wst.class); private Integer id; private River river;
--- a/checkstyle.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/checkstyle.xml Wed Mar 02 10:26:50 2022 +0100 @@ -71,6 +71,7 @@ <!-- See http://checkstyle.sf.net/config_sizes.html --> <module name="LineLength"> <property name="ignorePattern" value="^ *\$wnd.*$"/> + <property name="severity" value="warning"/> </module>
--- a/docker/Dockerfile.artifacts Fri Feb 25 17:17:56 2022 +0100 +++ b/docker/Dockerfile.artifacts Wed Mar 02 10:26:50 2022 +0100 @@ -46,7 +46,7 @@ EXPOSE 8181 CMD mvn -Dexec.mainClass=org.dive4elements.artifactdatabase.App \ - -Dlog4j.configuration="file:///opt/d4e/river/artifacts/doc/conf/log4j.properties" \ + -Dlog4j2.configurationFile="file:///opt/d4e/river/artifacts/doc/conf/log4j2.xml" \ -Dartifact.database.dir="/opt/d4e/river/artifacts/doc/conf" \ -Dwsplgen.bin.path="/opt/d4e/river/artifacts/bin/wsplgen" \ compile exec:java
--- a/etl/bin/log4j.properties Fri Feb 25 17:17:56 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=DEBUG, A1 -log4j.category.org.hibernate=DEBUG - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d - %m%n
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etl/bin/log4j2.xml Wed Mar 02 10:26:50 2022 +0100 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %m%n"/> + </Console> + </Appenders> + <Loggers> + <Root level="DEBUG"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration>
--- a/etl/bin/run.sh Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/bin/run.sh Wed Mar 02 10:26:50 2022 +0100 @@ -7,7 +7,7 @@ CONF=${1:-../doc/conf.xml} CONF=$(readlink -f $CONF) -LOG4J_CONF=${2:-log4j.properties} +LOG4J_CONF=${2:-log4j2.xml} LOG4J_CONF=$(readlink -f $LOG4J_CONF) CLASSPATH= @@ -18,6 +18,6 @@ export CLASSPATH exec java \ - -Dlog4j.configuration=file://$LOG4J_CONF \ + -Dlog4j2.configurationFile=file://$LOG4J_CONF \ -Dconfig.file=$CONF \ $APP
--- a/etl/doc/README.txt Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/doc/README.txt Wed Mar 02 10:26:50 2022 +0100 @@ -45,7 +45,7 @@ System-Property config.file gesetzt werden. Dies geschieht über den Kommandozeilenparameter "-Dconfig.file=/pfad/zur/config.xml" im Start-Skript bin/run.sh oder als Parameter zu diesem Skript. -Als zweiter Parameter kann auch noch eine log4j.properties-Datei gegeben werden. +Als zweiter Parameter kann eine log4j-Konfigurations-Datei gegeben werden. Die Konfigurationsdatei hat folgende Struktur:
--- a/etl/pom-oracle.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/pom-oracle.xml Wed Mar 02 10:26:50 2022 +0100 @@ -34,9 +34,15 @@ </build> <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.xerial</groupId>
--- a/etl/pom.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/pom.xml Wed Mar 02 10:26:50 2022 +0100 @@ -34,9 +34,15 @@ </build> <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.xerial</groupId>
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,14 +18,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.w3c.dom.NodeList; public class DIPSGauge { - private static Logger log = Logger.getLogger(DIPSGauge.class); + private static Logger log = LogManager.getLogger(DIPSGauge.class); public static final Pattern DATE_PATTERN = Pattern.compile( "(\\d{4})-(\\d{2})-(\\d{2})(?:\\s+|T)(\\d{2}):(\\d{2}):(\\d{2})");
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,12 +21,13 @@ import java.util.Set; import java.util.TreeSet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** A Discharge Table. */ public class DischargeTable { - private static Logger log = Logger.getLogger(DischargeTable.class); + private static Logger log = LogManager.getLogger(DischargeTable.class); protected int id; protected int gaugeId;
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/Notification.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/Notification.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.net.URL; import java.net.URLConnection; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -26,7 +27,7 @@ public class Notification { - private static Logger log = Logger.getLogger(Notification.class); + private static Logger log = LogManager.getLogger(Notification.class); protected Document message;
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/River.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/River.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,12 +21,13 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class River extends IdPair { - private static Logger log = Logger.getLogger(River.class); + private static Logger log = LogManager.getLogger(River.class); protected String name;
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/Rivers.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/Rivers.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,11 +16,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Rivers { - private static Logger log = Logger.getLogger(Rivers.class); + private static Logger log = LogManager.getLogger(Rivers.class); public Rivers() { }
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/Sync.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/Sync.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -29,7 +30,7 @@ public class Sync { - private static Logger log = Logger.getLogger(Sync.class); + private static Logger log = LogManager.getLogger(Sync.class); public static final String FLYS = "flys"; public static final String AFT = "aft";
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/SyncContext.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/SyncContext.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import java.util.Map; import java.util.TreeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -26,7 +27,7 @@ public class SyncContext { - private static Logger log = Logger.getLogger(SyncContext.class); + private static Logger log = LogManager.getLogger(SyncContext.class); protected ConnectedStatements aftStatements; protected ConnectedStatements flysStatements;
--- a/etl/src/main/java/org/dive4elements/river/etl/db/ConnectedStatements.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/db/ConnectedStatements.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,11 +18,12 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class ConnectedStatements { - private static Logger log = Logger.getLogger(ConnectedStatements.class); + private static Logger log = LogManager.getLogger(ConnectedStatements.class); protected Connection connection;
--- a/etl/src/main/java/org/dive4elements/river/etl/db/ConnectionBuilder.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/db/ConnectionBuilder.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,14 +22,15 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.NodeList; public class ConnectionBuilder { - private static Logger log = Logger.getLogger(ConnectionBuilder.class); + private static Logger log = LogManager.getLogger(ConnectionBuilder.class); public static final String XPATH_DRIVER = "/sync/side[@name=$type]/db/driver/text()"; public static final String XPATH_USER = "/sync/side[@name=$type]/db/user/text()";
--- a/etl/src/main/java/org/dive4elements/river/etl/db/Statements.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/db/Statements.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,11 +16,12 @@ import java.util.Map; import java.util.Properties; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Statements { - private static Logger log = Logger.getLogger(Statements.class); + private static Logger log = LogManager.getLogger(Statements.class); public static final String RESOURCE_PATH = "/sql/"; public static final String COMMON_PROPERTIES = "-common.properties";
--- a/etl/src/main/java/org/dive4elements/river/etl/db/SymbolicStatement.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/db/SymbolicStatement.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,11 +22,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class SymbolicStatement { - private static Logger log = Logger.getLogger(SymbolicStatement.class); + private static Logger log = LogManager.getLogger(SymbolicStatement.class); public static final Pattern VAR = Pattern.compile(":([a-zA-Z0-9_]+)");
--- a/etl/src/main/java/org/dive4elements/river/etl/utils/XML.java Fri Feb 25 17:17:56 2022 +0100 +++ b/etl/src/main/java/org/dive4elements/river/etl/utils/XML.java Wed Mar 02 10:26:50 2022 +0100 @@ -42,7 +42,8 @@ import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathVariableResolver; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; @@ -51,7 +52,7 @@ public final class XML { /** Logger for this class. */ - private static Logger log = Logger.getLogger(XML.class); + private static Logger log = LogManager.getLogger(XML.class); public static class MapXPathVariableResolver implements XPathVariableResolver
--- a/gwt-client/pom.xml Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/pom.xml Wed Mar 02 10:26:50 2022 +0100 @@ -99,9 +99,15 @@ <version>4.2</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.mapfish.print</groupId>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/AddArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/AddArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.client.server; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.shared.exceptions.ServerException; import org.dive4elements.river.client.shared.model.Artifact; @@ -24,7 +25,7 @@ implements AddArtifactService { private static final Logger log = - Logger.getLogger(AddArtifactService.class); + LogManager.getLogger(AddArtifactService.class); public Collection add(
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/AdvanceServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/AdvanceServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -37,7 +38,7 @@ extends RemoteServiceServlet implements AdvanceService { - private static final Logger log = Logger.getLogger(AdvanceService.class); + private static final Logger log = LogManager.getLogger(AdvanceService.class); public static final String XPATH_RESULT = "/art:result/text()";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -53,7 +54,7 @@ public class ArtifactDescriptionFactory { private static final Logger log = - Logger.getLogger(ArtifactDescriptionFactory.class); + LogManager.getLogger(ArtifactDescriptionFactory.class); public static final String XPATH_STATE_NAME = "@art:name";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.util.ArrayList; import java.util.List; @@ -38,7 +39,7 @@ public class ArtifactHelper { /** Private logging instance. */ - private static final Logger log = Logger.getLogger(ArtifactHelper.class); + private static final Logger log = LogManager.getLogger(ArtifactHelper.class); /** The error message key that is thrown if an error occured while artifact
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.client.server; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -30,7 +31,7 @@ { /** Private log. */ private static final Logger log = - Logger.getLogger(ArtifactServiceImpl.class); + LogManager.getLogger(ArtifactServiceImpl.class); /**
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/AuthenticationServlet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/AuthenticationServlet.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.server.auth.User; import org.dive4elements.river.client.server.auth.UserClient; @@ -26,7 +27,7 @@ */ public class AuthenticationServlet extends HttpServlet { - private static Logger log = Logger.getLogger(AuthenticationServlet.class); + private static Logger log = LogManager.getLogger(AuthenticationServlet.class); private static final String FLYS_PAGE = "FLYS.html"; private static final String LOGIN_PAGE = "login.jsp";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java Wed Mar 02 10:26:50 2022 +0100 @@ -14,7 +14,8 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.server.features.Features; import org.dive4elements.river.client.server.features.XMLFileFeatures; @@ -25,7 +26,7 @@ */ public class BaseServletContextListener implements ServletContextListener { - public static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( BaseServletContextListener.class); @Override
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/BedKMChartServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/BedKMChartServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -29,7 +30,7 @@ public class BedKMChartServiceImpl extends HttpServlet { private static final Logger log = - Logger.getLogger(FixingsKMChartServiceImpl.class); + LogManager.getLogger(FixingsKMChartServiceImpl.class); public static final String SERVICE_NAME = "bed-km-chart";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/BedloadKMChartServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/BedloadKMChartServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -29,7 +30,7 @@ public class BedloadKMChartServiceImpl extends HttpServlet { private static final Logger log = - Logger.getLogger(FixingsKMChartServiceImpl.class); + LogManager.getLogger(FixingsKMChartServiceImpl.class); public static final String SERVICE_NAME = "bedload-km-chart";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CSVExportServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CSVExportServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -43,7 +44,7 @@ implements CSVExportService { private static final Logger log = - Logger.getLogger(CSVExportServiceImpl.class); + LogManager.getLogger(CSVExportServiceImpl.class); public static final String ERROR_NO_EXPORT_FOUND =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java Wed Mar 02 10:26:50 2022 +0100 @@ -26,7 +26,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -38,7 +39,7 @@ public class CapabilitiesParser { private static final Logger log = - Logger.getLogger(CapabilitiesParser.class); + LogManager.getLogger(CapabilitiesParser.class); public static final String ERR_GC_REQUEST_FAILED =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -54,7 +55,7 @@ implements ChartInfoService { private static final Logger log = - Logger.getLogger(ChartInfoServiceImpl.class); + LogManager.getLogger(ChartInfoServiceImpl.class); public static final String XPATH_TRANSFORM_MATRIX = "/art:chartinfo/art:transformation-matrix/art:matrix";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartOutputServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartOutputServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -40,7 +41,7 @@ extends HttpServlet { private static final Logger log = - Logger.getLogger(ChartOutputServiceImpl.class); + LogManager.getLogger(ChartOutputServiceImpl.class); /** Handle a get, collectionOut. */
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartServiceHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ChartServiceHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -26,7 +27,7 @@ public class ChartServiceHelper { private static final Logger log = - Logger.getLogger(ChartServiceHelper.class); + LogManager.getLogger(ChartServiceHelper.class); /** The default chart width if no value is specified in the request.*/
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionAttributeServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionAttributeServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -33,7 +34,7 @@ implements CollectionAttributeService { private static final Logger log = - Logger.getLogger(CollectionAttributeServiceImpl.class); + LogManager.getLogger(CollectionAttributeServiceImpl.class); public static final String ERROR_UPDATING_COLLECTION_ATTRIBUTE =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -70,7 +71,7 @@ public class CollectionHelper { private static final Logger log = - Logger.getLogger(CollectionHelper.class); + LogManager.getLogger(CollectionHelper.class); public static final String ERROR_ADD_ARTIFACT = "error_add_artifact";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionItemAttributeServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CollectionItemAttributeServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -41,7 +42,7 @@ implements CollectionItemAttributeService { private static final Logger log = - Logger.getLogger(CollectionItemAttributeServiceImpl.class); + LogManager.getLogger(CollectionItemAttributeServiceImpl.class); public static final String XPATH_RESULT = "/art:result/text()";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CreateCollectionServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CreateCollectionServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -41,7 +42,7 @@ { /** Private log. */ private static final Logger log = - Logger.getLogger(CreateCollectionServiceImpl.class); + LogManager.getLogger(CreateCollectionServiceImpl.class); /** XPath to figure out the uuid of the created collection.*/ public static final String XPATH_COLLECTION_UUID =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CrossSectionKMServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CrossSectionKMServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -40,7 +41,7 @@ implements CrossSectionKMService { private static final Logger log = - Logger.getLogger(CrossSectionKMServiceImpl.class); + LogManager.getLogger(CrossSectionKMServiceImpl.class); /** XPath that points to the found cross section measurements. */ public static final String XPATH_CROSS_SECTIONS
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.XMLUtils; import org.dive4elements.river.client.shared.model.Data; @@ -43,7 +44,7 @@ */ public class DataFactory { - private static final Logger log = Logger.getLogger(DataFactory.class); + private static final Logger log = LogManager.getLogger(DataFactory.class); public static final String NS_URI = ArtifactNamespaceContext.NAMESPACE_URI;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DeleteCollectionServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DeleteCollectionServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -27,7 +28,7 @@ implements DeleteCollectionService { private static final Logger log = - Logger.getLogger(DeleteCollectionServiceImpl.class); + LogManager.getLogger(DeleteCollectionServiceImpl.class); public static final String XPATH_RESULT = "/art:result/text()";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DescribeArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DescribeArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -36,7 +37,7 @@ implements DescribeArtifactService { private static final Logger log = - Logger.getLogger(DescribeArtifactServiceImpl.class); + LogManager.getLogger(DescribeArtifactServiceImpl.class); public static final String ERROR_DESCRIBE_ARTIFACT =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DescribeCollectionServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DescribeCollectionServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -39,7 +40,7 @@ implements DescribeCollectionService { private static final Logger log = - Logger.getLogger(DescribeCollectionServiceImpl.class); + LogManager.getLogger(DescribeCollectionServiceImpl.class); /** The error message key that is thrown if an error occured while
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -40,7 +41,7 @@ implements DischargeInfoService { private static final Logger log = - Logger.getLogger(DischargeInfoServiceImpl.class); + LogManager.getLogger(DischargeInfoServiceImpl.class); public static final String ERROR_NO_DISCHARGEINFO_FOUND = "error_no_dischargeinfo_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoXML.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoXML.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -36,7 +37,7 @@ public class DischargeInfoXML extends HttpServlet { - private static final Logger log = Logger.getLogger(DischargeInfoXML.class); + private static final Logger log = LogManager.getLogger(DischargeInfoXML.class); public static final String ERROR_NO_DISTANCEINFO_FOUND =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeTablesServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DischargeTablesServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -31,7 +32,7 @@ public class DischargeTablesServiceImpl extends HttpServlet { - private static final Logger log = Logger + private static final Logger log = LogManager .getLogger(DischargeInfoServiceImpl.class); private static final DateFormat DATE_FORMAT = DateFormat.getDateInstance(
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -40,7 +41,7 @@ implements DistanceInfoService { private static final Logger log = - Logger.getLogger(DistanceInfoServiceImpl.class); + LogManager.getLogger(DistanceInfoServiceImpl.class); public static final String ERROR_NO_DISTANCEINFO_FOUND = "error_no_distanceinfo_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoXML.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoXML.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -36,7 +37,7 @@ public class DistanceInfoXML extends HttpServlet { - private static final Logger log = Logger.getLogger(DistanceInfoXML.class); + private static final Logger log = LogManager.getLogger(DistanceInfoXML.class); public static final String ERROR_NO_DISTANCEINFO_FOUND =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DoCollectionAction.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DoCollectionAction.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -32,7 +33,7 @@ public class DoCollectionAction extends RemoteServiceServlet { private static final Logger log = - Logger.getLogger(DoCollectionAction.class); + LogManager.getLogger(DoCollectionAction.class); public static final String XPATH_RESULT = "/art:result/text()";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ExportServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ExportServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -40,7 +41,7 @@ extends HttpServlet { private static final Logger log = - Logger.getLogger(ExportServiceImpl.class); + LogManager.getLogger(ExportServiceImpl.class); public void doGet(HttpServletRequest req, HttpServletResponse resp) {
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FLYSArtifactCreator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FLYSArtifactCreator.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.XMLUtils; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; @@ -46,7 +47,7 @@ public class FLYSArtifactCreator implements ArtifactCreator { private static final Logger log = - Logger.getLogger(FLYSArtifactCreator.class); + LogManager.getLogger(FLYSArtifactCreator.class); /** The XPath to the artifact's uuid.*/
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FeedServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FeedServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -40,7 +41,7 @@ extends RemoteServiceServlet implements FeedService { - private static final Logger log = Logger.getLogger(FeedServiceImpl.class); + private static final Logger log = LogManager.getLogger(FeedServiceImpl.class); /** XPath that points to the result type of a feed or advance operation.*/
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -27,14 +27,15 @@ import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; public class FileUploadServiceImpl extends HttpServlet { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( FileUploadServiceImpl.class); @Override
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FixingsKMChartServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FixingsKMChartServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -25,7 +25,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +36,7 @@ extends HttpServlet { private static final Logger log = - Logger.getLogger(FixingsKMChartServiceImpl.class); + LogManager.getLogger(FixingsKMChartServiceImpl.class); public static final String SERVICE_NAME = "fixings-km-chart";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FixingsOverviewServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FixingsOverviewServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -33,7 +33,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +45,7 @@ implements FixingsOverviewService { private static final Logger log = - Logger.getLogger(FixingsOverviewServiceImpl.class); + LogManager.getLogger(FixingsOverviewServiceImpl.class); public static final String SERVICE_NAME = "fixings-overview";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GCServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GCServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.shared.exceptions.ServerException; import org.dive4elements.river.client.shared.model.Capabilities; @@ -24,7 +25,7 @@ extends RemoteServiceServlet implements GCService { - private static Logger log = Logger.getLogger(GCServiceImpl.class); + private static Logger log = LogManager.getLogger(GCServiceImpl.class); public Capabilities query(String path)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -56,7 +57,7 @@ private static final Logger log = - Logger.getLogger(GFIServiceImpl.class); + LogManager.getLogger(GFIServiceImpl.class); /**
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GaugeInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GaugeInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -42,7 +43,7 @@ implements GaugeInfoService { private static final Logger log = - Logger.getLogger(GaugeInfoServiceImpl.class); + LogManager.getLogger(GaugeInfoServiceImpl.class); public static final String ERROR_NO_GAUGES_FOUND =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GetArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GetArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -39,7 +40,7 @@ implements GetArtifactService { private static final Logger log = - Logger.getLogger(GetArtifactServiceImpl.class); + LogManager.getLogger(GetArtifactServiceImpl.class); public static final String ERROR_DESCRIBE_ARTIFACT =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/LoadArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/LoadArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.HashMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.shared.exceptions.ServerException; import org.dive4elements.river.client.shared.model.Artifact; @@ -31,7 +32,7 @@ implements LoadArtifactService { private static final Logger log = - Logger.getLogger(LoadArtifactServiceImpl.class); + LogManager.getLogger(LoadArtifactServiceImpl.class); /** Error. */ public static final String ERROR_LOAD_ARTIFACT = "error_load_artifact";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.server.auth.Authentication; import org.dive4elements.river.client.server.auth.AuthenticationException; @@ -24,7 +25,7 @@ public class LoginServlet extends AuthenticationServlet { - private static Logger log = Logger.getLogger(LoginServlet.class); + private static Logger log = LogManager.getLogger(LoginServlet.class); @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MapHelper.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MapHelper.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.XMLUtils; @@ -20,7 +21,7 @@ public class MapHelper { - private static final Logger log = Logger.getLogger(MapHelper.class); + private static final Logger log = LogManager.getLogger(MapHelper.class); public static final String XPATH_SRID =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MapInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MapInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.dive4elements.river.client.shared.model.BBox; import org.dive4elements.river.client.shared.model.MapInfo; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -37,7 +38,7 @@ implements MapInfoService { private static final Logger log = - Logger.getLogger(MapInfoServiceImpl.class); + LogManager.getLogger(MapInfoServiceImpl.class); public static final String XPATH_RIVER =
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MapOutputServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MapOutputServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -39,7 +40,7 @@ { private static final Logger log = - Logger.getLogger(MapOutputServiceImpl.class); + LogManager.getLogger(MapOutputServiceImpl.class); public static final String ERROR_NO_MAP_CONFIG = "error_no_map_config";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MapPrintServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MapPrintServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -40,7 +40,8 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -63,7 +64,7 @@ extends HttpServlet { private static final Logger log = - Logger.getLogger(MapPrintServiceImpl.class); + LogManager.getLogger(MapPrintServiceImpl.class); protected static class Layer implements Comparable<Layer> {
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MapUrlServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MapUrlServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -17,7 +17,8 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -33,7 +34,7 @@ { private static final Logger log = - Logger.getLogger(MapUrlServiceImpl.class); + LogManager.getLogger(MapUrlServiceImpl.class); public Map<String, String> getUrls()
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/MetaDataServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/MetaDataServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -44,7 +45,7 @@ { /** Our very own log. */ private static final Logger log = - Logger.getLogger(MetaDataServiceImpl.class); + LogManager.getLogger(MetaDataServiceImpl.class); public static final String ERROR_NO_META_DATA_FOUND = "error_no_meta_data_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ModuleServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ModuleServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -34,7 +35,7 @@ implements ModuleService { private static final Logger log = - Logger.getLogger(ModuleServiceImpl.class); + LogManager.getLogger(ModuleServiceImpl.class); public static final String XPATH_MODULES = "/art:modules/art:module";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/RemoveArtifactServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/RemoveArtifactServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.client.server; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.shared.exceptions.ServerException; import org.dive4elements.river.client.shared.model.Collection; @@ -23,7 +24,7 @@ implements RemoveArtifactService { private static final Logger log = - Logger.getLogger(RemoveArtifactServiceImpl.class); + LogManager.getLogger(RemoveArtifactServiceImpl.class); public Collection remove(
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ReportServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ReportServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -34,7 +35,7 @@ implements ReportService { private static final Logger log = - Logger.getLogger(ReportServiceImpl.class); + LogManager.getLogger(ReportServiceImpl.class); @Override
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -16,7 +16,8 @@ import java.util.Locale; import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -48,7 +49,7 @@ implements RiverInfoService { private static final Logger log = - Logger.getLogger(RiverInfoServiceImpl.class); + LogManager.getLogger(RiverInfoServiceImpl.class); public static final String ERROR_NO_RIVER_INFO_FOUND = "error_no_riverinfo_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -24,7 +24,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -42,7 +43,7 @@ { /** Private log. */ private static final Logger log = - Logger.getLogger(RiverServiceImpl.class); + LogManager.getLogger(RiverServiceImpl.class); /** The XPath string that points to the rivers in the resulting document.*/ public static final String XPATH_RIVERS = "/art:rivers/art:river";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SQKMChartServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SQKMChartServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,7 +8,8 @@ package org.dive4elements.river.client.server; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.io.InputStream; @@ -34,7 +35,7 @@ extends HttpServlet { private static final Logger log = - Logger.getLogger(FixingsKMChartServiceImpl.class); + LogManager.getLogger(FixingsKMChartServiceImpl.class); public static final String SERVICE_NAME = "sq-km-chart";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java Wed Mar 02 10:26:50 2022 +0100 @@ -19,7 +19,8 @@ import org.apache.commons.codec.binary.Base64InputStream; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.server.auth.AuthenticationException; import org.dive4elements.river.client.server.auth.User; @@ -30,7 +31,7 @@ public class SamlServlet extends AuthenticationServlet { - private static Logger log = Logger.getLogger(SamlServlet.class); + private static Logger log = LogManager.getLogger(SamlServlet.class); @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SedimentLoadInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SedimentLoadInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -11,7 +11,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -35,7 +36,7 @@ implements SedimentLoadInfoService { private static final Logger log = - Logger.getLogger(SedimentLoadInfoServiceImpl.class); + LogManager.getLogger(SedimentLoadInfoServiceImpl.class); public static final String ERROR_NO_SEDIMENTLOADINFO_FOUND = "error_no_sedimentloadinfo_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ServerInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ServerInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.XMLUtils; import org.dive4elements.artifacts.httpclient.http.HttpClient; @@ -29,7 +30,7 @@ // This works only because currently there is only one info transmitted private static final String XPATH_INFO = "/art:server/art:info"; - private final Logger log = Logger.getLogger(ServerInfoServiceImpl.class); + private final Logger log = LogManager.getLogger(ServerInfoServiceImpl.class); @Override public Map<String, String> getConfig(String locale) {
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SetCollectionNameServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SetCollectionNameServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -27,7 +28,7 @@ implements SetCollectionNameService { private static final Logger log = - Logger.getLogger(SetCollectionNameServiceImpl.class); + LogManager.getLogger(SetCollectionNameServiceImpl.class); public void setName(Collection c)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SetCollectionTTLServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SetCollectionTTLServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -27,7 +28,7 @@ implements SetCollectionTTLService { private static final Logger log = - Logger.getLogger(SetCollectionTTLServiceImpl.class); + LogManager.getLogger(SetCollectionTTLServiceImpl.class); public static final String XPATH_RESULT = "/art:result/text()";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/StepForwardServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/StepForwardServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import org.w3c.dom.Document; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; import org.dive4elements.artifacts.common.utils.ClientProtocolUtils; @@ -40,7 +41,7 @@ implements StepForwardService { private static final Logger log = - Logger.getLogger(StepForwardServiceImpl.class); + LogManager.getLogger(StepForwardServiceImpl.class); /** XPath that points to the result type of a feed or advance operation.*/
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/ThemeListingServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/ThemeListingServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -28,7 +28,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +45,7 @@ implements ThemeListingService { private static final Logger log = - Logger.getLogger(ThemeListingServiceImpl.class); + LogManager.getLogger(ThemeListingServiceImpl.class); private static final String XPATH_THEME_GROUPS = "/themes/themegroup";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/UserCollectionsServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/UserCollectionsServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -46,7 +47,7 @@ extends RemoteServiceServlet implements UserCollectionsService { - private static final Logger log = Logger.getLogger( + private static final Logger log = LogManager.getLogger( UserCollectionsServiceImpl.class);
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -12,7 +12,8 @@ import org.w3c.dom.Element; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.artifacts.common.ArtifactNamespaceContext; @@ -32,7 +33,7 @@ implements UserService { /** Private log. */ - private static final Logger log = Logger.getLogger(UserServiceImpl.class); + private static final Logger log = LogManager.getLogger(UserServiceImpl.class); public static final String ERROR_NO_SUCH_USER = "error_no_such_user";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/WQInfoServiceImpl.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/WQInfoServiceImpl.java Wed Mar 02 10:26:50 2022 +0100 @@ -21,7 +21,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -46,7 +47,7 @@ implements WQInfoService { private static final Logger log = - Logger.getLogger(WQInfoServiceImpl.class); + LogManager.getLogger(WQInfoServiceImpl.class); public static final String ERROR_NO_WQINFO_FOUND = "error_no_wqinfo_found";
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/AuthenticationFactory.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/AuthenticationFactory.java Wed Mar 02 10:26:50 2022 +0100 @@ -8,12 +8,13 @@ package org.dive4elements.river.client.server.auth; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class AuthenticationFactory { private static final Logger log = - Logger.getLogger(AuthenticationFactory.class); + LogManager.getLogger(AuthenticationFactory.class); public static Authenticator getInstance(String name) throws IllegalArgumentException
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/UserClient.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/UserClient.java Wed Mar 02 10:26:50 2022 +0100 @@ -10,7 +10,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -30,7 +31,7 @@ */ public class UserClient { - private static final Logger log = Logger.getLogger(UserClient.class); + private static final Logger log = LogManager.getLogger(UserClient.class); private String url;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java Wed Mar 02 10:26:50 2022 +0100 @@ -22,7 +22,8 @@ import javax.servlet.ServletContext; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.server.features.Features; @@ -33,7 +34,7 @@ implements org.dive4elements.river.client.server.auth.Authenticator { private static final Logger log = - Logger.getLogger(Authenticator.class); + LogManager.getLogger(Authenticator.class); public static class Authentication implements org.dive4elements.river.client.server.auth.Authentication
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/Assertion.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/Assertion.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import javax.xml.namespace.QName; import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -28,7 +29,7 @@ */ public class Assertion { - private static Logger log = Logger.getLogger(Assertion.class); + private static Logger log = LogManager.getLogger(Assertion.class); private Element assertion; private LinkedList<String> roles;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/TicketValidator.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/TicketValidator.java Wed Mar 02 10:26:50 2022 +0100 @@ -23,7 +23,8 @@ import javax.xml.crypto.dsig.XMLSignatureFactory; import javax.xml.crypto.dsig.dom.DOMValidateContext; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -40,7 +41,7 @@ /** * The log used by the TicketValidator instances. */ - private static Logger log = Logger.getLogger(TicketValidator.class); + private static Logger log = LogManager.getLogger(TicketValidator.class); /** * The trusted Key for signature checks.
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Request.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Request.java Wed Mar 02 10:26:50 2022 +0100 @@ -13,7 +13,8 @@ import org.apache.commons.codec.binary.Base64; import org.apache.http.client.methods.HttpGet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Request extends HttpGet { @@ -22,7 +23,7 @@ private final static String METHOD_AUTH_PASSWORD = "urn:opengeospatial:authNMethod:OWS:1.0:password"; - private static Logger log = Logger.getLogger(Request.class); + private static Logger log = LogManager.getLogger(Request.class); public Request(String uri) { String request = uri + "?VERSION=" + VERSION + "&REQUEST=" +
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import org.apache.http.HttpEntity; import org.apache.http.util.EntityUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -36,7 +37,7 @@ public class Response implements Authentication { - private static Logger log = Logger.getLogger(Response.class); + private static Logger log = LogManager.getLogger(Response.class); private Element root; private String samlTicketXML;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/features/XMLFileFeatures.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/features/XMLFileFeatures.java Wed Mar 02 10:26:50 2022 +0100 @@ -18,7 +18,8 @@ import javax.xml.xpath.XPathConstants; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -30,7 +31,7 @@ public class XMLFileFeatures implements Features { private static final Logger log = - Logger.getLogger(XMLFileFeatures.class); + LogManager.getLogger(XMLFileFeatures.class); private Map<String, List<String>> featuremap = new HashMap<String, List<String>>();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java Wed Mar 02 10:26:50 2022 +0100 @@ -30,14 +30,15 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** ServletFilter used for GGInA authentification and certain authorisation. */ public class GGInAFilter implements Filter { /** Private log. */ - private static Logger log = Logger.getLogger(GGInAFilter.class); + private static Logger log = LogManager.getLogger(GGInAFilter.class); private boolean deactivate = false; private boolean loginDisabled = false;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/NoCacheFilter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/NoCacheFilter.java Wed Mar 02 10:26:50 2022 +0100 @@ -20,7 +20,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** ServletFilter to avoid caching for GWTs *.nocache.* files. */ public class NoCacheFilter implements Filter { @@ -29,7 +30,7 @@ private static final String NO_CACHE = ".nocache."; - private static Logger log = Logger.getLogger(NoCacheFilter.class); + private static Logger log = LogManager.getLogger(NoCacheFilter.class); /** * Initialize.
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/meta/Converter.java Fri Feb 25 17:17:56 2022 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/meta/Converter.java Wed Mar 02 10:26:50 2022 +0100 @@ -15,7 +15,8 @@ import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.dive4elements.river.client.shared.model.DataCageTree; import org.dive4elements.river.client.shared.model.DataCageNode; @@ -33,7 +34,7 @@ */ public class Converter { - private static final Logger log = Logger.getLogger(Converter.class); + private static final Logger log = LogManager.getLogger(Converter.class); public interface NodeConverter
--- a/gwt-client/src/main/webapp/WEB-INF/classes/log4j.properties Fri Feb 25 17:17:56 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -log4j.rootLogger=DEBUG, FLYS - -########## INTERNAL PACKAGES -log4j.category.de.intevation.flys.client.server=DEBUG - - -########## EXTERNAL PACKAGES -log4j.category.org.apache.http=ERROR -log4j.category.de.intevation.artifacts.httpclient=WARN - -########## APPENDER SETTINGS -log4j.appender.FLYS.layout=org.apache.log4j.PatternLayout -log4j.appender.FLYS.layout.ConversionPattern=%d [%t] %-5p %c - %m%n - -log4j.appender.FLYS=org.apache.log4j.RollingFileAppender -log4j.appender.FLYS.File=/var/log/d4e-river/d4e-client.log -log4j.appender.FLYS.MaxFileSize=5000KB -log4j.appender.FLYS.MaxBackupIndex=3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gwt-client/src/main/webapp/WEB-INF/classes/log4j2.xml Wed Mar 02 10:26:50 2022 +0100 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <RollingFile + name="RollingFile" + fileName="/var/log/d4e-river/d4e-client.log" + filePattern="/var/log/d4e-river/d4e-client.log.%i"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n"/> + <SizeBasedTriggeringPolicy size="5000 KB"/> + <DefaultRolloverStrategy max="3"/> + </RollingFile> + </Appenders> + <Loggers> + <Root level="DEBUG"> + <AppenderRef ref="RollingFile"/> + </Root> + <Logger name="org.apache.http" level="ERROR" additivity="false"/> + </Loggers> +</Configuration>