fix log4j changes

wso2 · Aug 5, 2019 · 175733d · 175733d
1 parent 60ace38
commit 175733d
Show file tree

Hide file tree

Showing 23 changed files with 94 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: java
+jdk:
+    - openjdk8
+cache:
+  directories:
+  - .autoconf
+  - $HOME/.m2
+script: mvn clean install
diff --git a/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml b/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml
@@ -61,8 +61,8 @@
             <artifactId>org.wso2.carbon.ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/event-flow/org.wso2.carbon.event.flow/pom.xml b/components/event-flow/org.wso2.carbon.event.flow/pom.xml
@@ -48,9 +48,7 @@
                             org.wso2.carbon.event.flow.*
                         </Export-Package>
                         <Import-Package>
-                            org.apache.log4j; version="0.0.0",
-                            org.apache.log4j.spi; version="0.0.0",
-                            org.wso2.carbon.utils.logging.appenders; version="[4.3.0,5.0.0)",
+                            org.apache.commons.logging.*; version="${import.package.version.commons.logging}",
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
@@ -66,8 +64,8 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang.wso2</groupId>

diff --git a/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml
@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventPublisherBolt.java b/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventPublisherBolt.java
@@ -21,7 +21,8 @@
 import backtype.storm.topology.base.BaseBasicBolt;
 import backtype.storm.tuple.Tuple;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.event.processor.common.util.AsyncEventPublisher;
 import org.wso2.carbon.event.processor.manager.commons.utils.Utils;
 import org.wso2.carbon.event.processor.manager.core.config.DistributedConfiguration;
@@ -38,7 +39,7 @@
  * Publish events processed by Siddhi engine to CEP publisher
  */
 public class EventPublisherBolt extends BaseBasicBolt {
-    private transient Logger log = Logger.getLogger(EventPublisherBolt.class);
+    private transient Log log = LogFactory.getLog(EventPublisherBolt.class);
     /**
      * All stream definitions processed
      */
@@ -120,14 +121,14 @@ public void prepare(Map stormConf, TopologyContext context) {
 
     private void init() {
         try {
-            log = Logger.getLogger(EventPublisherBolt.class);
+            log = LogFactory.getLog(EventPublisherBolt.class);
             initialized = true;
             //Adding functionality to support query execution at publisher level for future use cases.
             if (query != null && (!query.isEmpty())) {
                 siddhiManager = new SiddhiManager();
                 eventCount = 0;
                 batchStartTime = System.currentTimeMillis();
-                log = Logger.getLogger(SiddhiBolt.class);
+                log = LogFactory.getLog(SiddhiBolt.class);
 
                 String fullQueryExpression = Utils.constructQueryExpression(inputStreamDefinitions, outputStreamDefinitions,
                         query);

diff --git a/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventReceiverSpout.java b/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventReceiverSpout.java
@@ -20,7 +20,8 @@
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import backtype.storm.tuple.Fields;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
@@ -48,7 +49,7 @@
  * the events as tuples to the connected component(i.e. Siddhi Bolt).
  */
 public class EventReceiverSpout extends BaseRichSpout implements StreamCallback {
-    private static transient Logger log = Logger.getLogger(EventReceiverSpout.class);
+    private static transient Log log = LogFactory.getLog(EventReceiverSpout.class);
     /**
      * Listening port of the thrift receiver
      */

diff --git a/...mmon/src/main/java/org/wso2/carbon/event/processor/common/storm/component/SiddhiBolt.java b/...mmon/src/main/java/org/wso2/carbon/event/processor/common/storm/component/SiddhiBolt.java
@@ -22,7 +22,8 @@
 import backtype.storm.tuple.Fields;
 import backtype.storm.tuple.Tuple;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.event.processor.common.util.ThroughputProbe;
 import org.wso2.carbon.event.processor.manager.commons.utils.Utils;
 import org.wso2.siddhi.core.ExecutionPlanRuntime;
@@ -45,7 +46,7 @@
 
 public class SiddhiBolt extends BaseBasicBolt {
     private final String name;
-    private transient Logger log = Logger.getLogger(SiddhiBolt.class);
+    private transient Log log = LogFactory.getLog(SiddhiBolt.class);
     private transient SiddhiManager siddhiManager;
 
     /**
@@ -90,7 +91,7 @@ public SiddhiBolt(String name, List<String> inputStreamDefinitions, String query
      * Bolt get saved and reloaded, this to redo the configurations.
      */
     private void init() {
-        log = Logger.getLogger(SiddhiBolt.class);
+        log = LogFactory.getLog(SiddhiBolt.class);
 
         inputThroughputProbe = new ThroughputProbe(logPrefix + "-IN", 10);
         emitThroughputProbe = new ThroughputProbe(logPrefix + " -EMIT", 10);

diff --git a/...on/src/main/java/org/wso2/carbon/event/processor/common/storm/component/TriggerSpout.java b/...on/src/main/java/org/wso2/carbon/event/processor/common/storm/component/TriggerSpout.java
@@ -5,7 +5,8 @@
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import backtype.storm.tuple.Fields;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.siddhi.core.ExecutionPlanRuntime;
 import org.wso2.siddhi.core.SiddhiManager;
 import org.wso2.siddhi.core.event.Event;
@@ -27,7 +28,7 @@ public class TriggerSpout extends BaseRichSpout {
     SpoutOutputCollector outputCollector;
     private transient SiddhiManager siddhiManager;
     private transient ExecutionPlanRuntime executionPlanRuntime;
-    private static transient Logger log = Logger.getLogger(TriggerSpout.class);
+    private static transient Log log = LogFactory.getLog(TriggerSpout.class);
     String logPrefix;
 
     public  TriggerSpout(String triggerId, String triggerDefinition, String executionPlanName, int tenantId){

diff --git a/...ava/org/wso2/carbon/event/processor/common/storm/manager/service/StormManagerService.java b/...ava/org/wso2/carbon/event/processor/common/storm/manager/service/StormManagerService.java
diff --git a/...common/src/main/java/org/wso2/carbon/event/processor/common/util/AsyncEventPublisher.java b/...common/src/main/java/org/wso2/carbon/event/processor/common/util/AsyncEventPublisher.java
@@ -21,7 +21,8 @@
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
@@ -54,7 +55,7 @@
 public class AsyncEventPublisher implements EventHandler<AsynchronousEventBuffer.DataHolder>, ConnectionFailureHandler {
     public enum DestinationType {STORM_RECEIVER, CEP_PUBLISHER}
 
-    private transient Logger log = Logger.getLogger(AsyncEventPublisher.class);
+    private transient Log log = LogFactory.getLog(AsyncEventPublisher.class);
     private String logPrefix;
 
     private String destinationTypeString;

diff --git a/...sor.common/src/main/java/org/wso2/carbon/event/processor/common/util/ThroughputProbe.java b/...sor.common/src/main/java/org/wso2/carbon/event/processor/common/util/ThroughputProbe.java
@@ -1,6 +1,7 @@
 package org.wso2.carbon.event.processor.common.util;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.text.DecimalFormat;
 import java.util.Timer;
@@ -11,7 +12,7 @@
  * and the call  update() for each message.
  */
 public class ThroughputProbe extends TimerTask {
-    private static Logger log = Logger.getLogger(ThroughputProbe.class);
+    private static Log log = LogFactory.getLog(ThroughputProbe.class);
     private long count = 0;
     private int sampleCount = 0;
     private long samplingRateInSeconds;

diff --git a/...so2/carbon/event/processor/core/internal/listener/AbstractSiddhiInputEventDispatcher.java b/...so2/carbon/event/processor/core/internal/listener/AbstractSiddhiInputEventDispatcher.java
@@ -17,7 +17,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.event.processor.core.ExecutionPlanConfiguration;
 import org.wso2.carbon.event.processor.core.internal.ds.EventProcessorValueHolder;
 import org.wso2.carbon.event.processor.core.internal.util.EventProcessorConstants;
@@ -33,7 +34,7 @@
  * Abstract class for classes which feeds incoming events to Siddhi.
  */
 public abstract class AbstractSiddhiInputEventDispatcher implements SiddhiEventConsumer {
-    private Logger trace = Logger.getLogger(EventProcessorConstants.EVENT_TRACE_LOGGER);
+    private Log trace = LogFactory.getLog(EventProcessorConstants.EVENT_TRACE_LOGGER);
     private static Log log = LogFactory.getLog(AbstractSiddhiInputEventDispatcher.class);
     protected final String streamId;
     protected String siddhiStreamId;

diff --git a/...va/org/wso2/carbon/event/processor/core/internal/listener/SiddhiOutputStreamListener.java b/...va/org/wso2/carbon/event/processor/core/internal/listener/SiddhiOutputStreamListener.java
@@ -15,7 +15,8 @@
  */
 package org.wso2.carbon.event.processor.core.internal.listener;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.databridge.commons.StreamDefinition;
 import org.wso2.carbon.event.processor.core.ExecutionPlanConfiguration;
@@ -47,7 +48,7 @@ public class SiddhiOutputStreamListener extends StreamCallback implements EventP
     protected String tracerPrefix;
     private Counter eventCounter;
     protected EventProducerCallback eventProducerCallback;
-    private Logger trace = Logger.getLogger(EventProcessorConstants.EVENT_TRACE_LOGGER);
+    private Log trace = LogFactory.getLog(EventProcessorConstants.EVENT_TRACE_LOGGER);
 
     public SiddhiOutputStreamListener(String siddhiStreamName, String streamId,
                                       ExecutionPlanConfiguration executionPlanConfiguration, int tenantId)

diff --git a/...a/org/wso2/carbon/event/processor/core/internal/storm/SiddhiStormOutputEventListener.java b/...a/org/wso2/carbon/event/processor/core/internal/storm/SiddhiStormOutputEventListener.java
@@ -16,7 +16,8 @@
 package org.wso2.carbon.event.processor.core.internal.storm;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
@@ -49,7 +50,7 @@
  * the event to the relevant output adaptor for the stream.
  */
 public class SiddhiStormOutputEventListener implements StreamCallback {
-    private static final Logger log = Logger.getLogger(SiddhiStormOutputEventListener.class);
+    private static final Log log = LogFactory.getLog(SiddhiStormOutputEventListener.class);
     private ExecutionPlanConfiguration executionPlanConfiguration;
     private int listeningPort;
     private int tenantId;

diff --git a/.../java/org/wso2/carbon/event/processor/core/internal/storm/manager/StormManagerServer.java b/.../java/org/wso2/carbon/event/processor/core/internal/storm/manager/StormManagerServer.java
@@ -20,7 +20,8 @@
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.ILock;
 import com.hazelcast.core.IMap;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
@@ -39,7 +40,7 @@ public class StormManagerServer {
     private static final String STORM_HZ_MAP_ACTIVE_MANAGER_KEY = "storm.hazelcast.map.active.manager.key";
     private static final String STORM_ROLE_TO_MEMBERSHIP_HZ_MAP = "storm.role.membership.hazelcast.map";
 
-    private static Logger log = Logger.getLogger(StormManagerServer.class);
+    private static Log log = LogFactory.getLog(StormManagerServer.class);
     private TThreadPoolServer stormManagerServer;
     private StormManagerServiceImpl stormManagerService;
     private IMap<String, String> roleToMembershipMap;

diff --git a/.../org/wso2/carbon/event/processor/core/internal/storm/manager/StormManagerServiceImpl.java b/.../org/wso2/carbon/event/processor/core/internal/storm/manager/StormManagerServiceImpl.java
@@ -16,7 +16,8 @@
 
 package org.wso2.carbon.event.processor.core.internal.storm.manager;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.TException;
 import org.wso2.carbon.event.processor.common.storm.manager.service.StormManagerService;
 import org.wso2.carbon.event.processor.common.storm.manager.service.exception.EndpointNotFoundException;
@@ -27,7 +28,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class StormManagerServiceImpl implements StormManagerService.Iface {
-    private static  Logger log = Logger.getLogger(StormManagerServiceImpl.class);
+    private static  Log log = LogFactory.getLog(StormManagerServiceImpl.class);
     public static final long MILLISECONDS_PER_MINUTE = 60000;
     private ConcurrentHashMap<String, Set<Endpoint>> stormReceivers = new ConcurrentHashMap<String, Set<Endpoint>>();
     private ConcurrentHashMap<String, Set<Endpoint>> cepPublishers = new ConcurrentHashMap<String, Set<Endpoint>>();

diff --git a/...rbon/event/processor/core/internal/storm/status/monitor/StormStatusHolderInitializer.java b/...rbon/event/processor/core/internal/storm/status/monitor/StormStatusHolderInitializer.java
@@ -18,7 +18,8 @@
 
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.event.processor.core.internal.ds.EventProcessorValueHolder;
 import org.wso2.carbon.event.processor.core.internal.storm.StormTopologyManager;
 import org.wso2.carbon.event.processor.core.util.DistributedModeConstants;
@@ -28,7 +29,7 @@
  * Utility to initialize the statusHolder.
  */
 public class StormStatusHolderInitializer {
-    private static Logger log = Logger.getLogger(StormStatusHolderInitializer.class);
+    private static Log log = LogFactory.getLog(StormStatusHolderInitializer.class);
 
     public static void initializeStatusHolder(String executionPlanName, int tenantId,
                                               int parallel) {

diff --git a/...va/org/wso2/carbon/event/processor/core/internal/storm/util/StormTopologyConstructor.java b/...va/org/wso2/carbon/event/processor/core/internal/storm/util/StormTopologyConstructor.java
@@ -21,7 +21,8 @@
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.event.processor.common.storm.component.EventPublisherBolt;
 import org.wso2.carbon.event.processor.common.storm.component.EventReceiverSpout;
 import org.wso2.carbon.event.processor.common.storm.component.SiddhiBolt;
@@ -45,7 +46,7 @@
  */
 public class StormTopologyConstructor {
 
-    private static Logger log = Logger.getLogger(StormTopologyConstructor.class);
+    private static Log log = LogFactory.getLog(StormTopologyConstructor.class);
 
     public static TopologyBuilder constructTopologyBuilder(String queryPlanString, String executionPlanName, int tenantId,
                                                            DistributedConfiguration stormDeploymentConfig)

diff --git a/components/event-processor/org.wso2.carbon.event.processor.siddhi.extension/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.siddhi.extension/pom.xml
@@ -34,8 +34,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml
@@ -36,8 +36,8 @@
             <artifactId>org.wso2.carbon.event.template.manager.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

diff --git a/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.fuser/pom.xml b/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.fuser/pom.xml
@@ -23,8 +23,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.notifier/pom.xml b/components/geo-dashboard/org.wso2.carbon.siddhi.geo.event.notifier/pom.xml
@@ -39,8 +39,8 @@
             <artifactId>siddhi-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>