Mvn-ize build and upgrade to log4j 2

Author: Bravo27

README.md

@@ -53,9 +53,6 @@ The `adapters.xml` file for the *RSS News Demo*, should look like:
       <param name="modes_for_item_family_1">DISTINCT</param>
       <param name="item_family_2">rss_info_.*</param>
       <param name="modes_for_item_family_2">COMMAND</param>
-
-      <param name="log_config">adapters_log_conf.xml</param>
-      <param name="log_config_refresh_seconds">10</param>
     </metadata_provider>
 
     <data_provider name="RSS_ADAPTER">
@@ -96,29 +93,24 @@ If you want to install a version of the *RSS News Demo* in your local Lightstrea
 
 * Download *Lightstreamer Server* (Lightstreamer Server comes with a free non-expiring demo license for 20 connected users) from [Lightstreamer Download page](http://www.lightstreamer.com/download.htm), and install it, as explained in the `GETTING_STARTED.TXT` file in the installation home directory.
 * Make sure that Lightstreamer Server is not running.
-* Get the `deploy.zip` file of the [latest release](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java/releases), unzip it, and copy the `RSS` folder into the `adapters` folder of your Lightstreamer Server installation.
+* Get the `deploy.zip` file of the [latest release](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java/releases), unzip it, and copy the `RSSDemo` folder into the `adapters` folder of your Lightstreamer Server installation.
+* [Optional] Customize the logging settings in log4j configuration file: `RSSDemo/classes/log4j2.xml`.
 * Launch Lightstreamer Server.
 * Test the Adapter, launching the [Lightstreamer - RSS News Demo - HTML Client](https://github.com/Lightstreamer/Lightstreamer-example-RSS-client-javascript) listed in [Clients Using This Adapter](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java#client-using-this-adapter).
 
 ## Build
 
-To build your own version of `LS_rss_reader.jar`, `LS_rss_data_adapter.jar`, and `LS_rss_metadata_adapter.jar`, instead of using the one provided in the `deploy.zip` file from the [Install](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java#install) section above, follow these steps:
-
-* Download this project.
-* Get the `ls-adapter-interface.jar` file from the [latest Lightstreamer distribution](http://www.lightstreamer.com/download), and copy it into the `lib` folder.
-* Get the `log4j-1.2.17.jar` file from [Apache log4j](https://logging.apache.org/log4j/1.2/) and copy it into the `lib` folder.
-* Get the `informa.jar` and `jdom.jar` files from the [News Aggregation Library for Java download](http://sourceforge.net/projects/informa/), and copy it into the `lib` folder.
-* Get the `commons-logging.jar` file from [Apache commons](http://commons.apache.org/proper/commons-logging/download_logging.cgi), and copy it into the `lib` folder.
-* Create the jars `LS_rss_reader.jar`, `LS_rss_data_adapter.jar`, and `LS_rss_metadata_adapter.jar` with commands like these:
-
-```sh
- > mkdir tmp_classes/feed tmp_classes/adapter tmp_classes/metadata
- > javac -source 1.7 -target 1.7 -nowarn -g -classpath lib/log4j-1.2.17.jar;lib/ls-adapter-interface.jar;lib/informa.jar;lib/jdom.jar -sourcepath src/src_feed -d tmp_classes/feed src/src_feed/rss_demo/rss_reader/RSSReaderProvider.java
- > jar cvf LS_rss_reader.jar -C tmp_classes/feed .
- > javac -source 1.7 -target 1.7 -nowarn -g -classpath lib/log4j-1.2.17.jar;lib/ls-adapter-interface.jar;LS_rss_reader.jar -sourcepath src/src_adapter -d tmp_classes/adapter src/src_adapter/rss_demo/adapters/RSSDataAdapter.java
- > jar cvf LS_rss_data_adapter.jar -C tmp_classes/adapter .
- > javac -source 1.7 -target 1.7 -nowarn -g -classpath lib/log4j-1.2.17.jar;lib/ls-adapter-interface.jar;LS_rss_data_adapter.jar -sourcepath src/src_metadata -d tmp_classes/metadata src/src_metadata/rss_demo/adapters/RSSMetadataAdapter.java
- > jar cvf LS_rss_metadata_adapter.jar -C tmp_classes/metadata .
+To build your own version of `example-RSS-adapter-java-0.0.1-SNAPSHOT.jar` instead of using the one provided in the `deploy.zip` file from the [Install](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java#install) section above, you have two options:
+either use [Maven](https://maven.apache.org/) (or other build tools) to take care of dependencies and building (recommended) or gather the necessary jars yourself and build it manually.
+For the sake of simplicity only the Maven case is detailed here.
+
+### Maven
+
+You can easily build and run this application using Maven through the pom.xml file located in the root folder of this project. As an alternative, you can use an alternative build tool (e.g. Gradle, Ivy, etc.) by converting the provided pom.xml file.
+
+Assuming Maven is installed and available in your path you can build the demo by running
+```sh 
+ mvn install dependency:copy-dependencies 
 ```
 
 ## See Also
@@ -136,5 +128,6 @@ To build your own version of `LS_rss_reader.jar`, `LS_rss_data_adapter.jar`, and
 
 ## Lightstreamer Compatibility Notes
 
-* Compatible with Lightstreamer SDK for Java In-Process Adapters since 6.0
+- Compatible with Lightstreamer SDK for Java In-Process Adapters since 7.3.
+- For a version of this example compatible with Lightstreamer SDK for Java Adapters version 6.0, please refer to [this tag](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java/tree/pre_mvn).
 - For a version of this example compatible with Lightstreamer SDK for Java Adapters version 5.1, please refer to [this tag](https://github.com/Lightstreamer/Lightstreamer-example-RSS-adapter-java/tree/for_Lightstreamer_5.1).

lib/README.md

@@ -0,0 +1,91 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.lightstreamer</groupId>
+  <artifactId>example-RSS-adapter-java</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>example-RSS-adapter-java</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>rss_demo.adapters.RSSMetadataAdapter</mainClass>
+        </configuration>
+      </plugin>
+         
+    </plugins>
+  </build>
+  
+  <repositories>
+    <repository>
+      <id>Twitter</id>
+      <name>Twitter repository</name>
+      <url>https://maven.twttr.com/</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lightstreamer</groupId>
+      <artifactId>ls-adapter-inprocess</artifactId>
+      <version>7.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.13.3</version>
+    </dependency>
+	<!-- https://mvnrepository.com/artifact/jdom/jdom -->
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/informa/informa -->
+    <dependency>
+      <groupId>informa</groupId>
+      <artifactId>informa</artifactId>
+      <version>0.6.0</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+    </dependency>
+  </dependencies>
+  
+</project>

pom.xml

@@ -22,9 +22,9 @@
 import java.util.LinkedList;
 import java.util.Set;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Level;
 
 import rss_demo.rss_reader.RSSReaderProvider;
 
@@ -41,8 +41,7 @@
  */
 
 public class AggregatorFeed {
-    private static Logger logger =
-        Logger.getLogger("LS_demos_Logger.NewsAggregator.adapter");
+    private static Logger logger = LogManager.getLogger("LS_demos_Logger.NewsAggregator.adapter");
 
     private String feed;
     private HashMap users = new HashMap();
@@ -255,7 +254,7 @@ public int getUsersNumber() {
         }
     }
 
-    private void feedLog(String mex, Priority level) {
+    private void feedLog(String mex, Level level) {
         logger.log(level, "|" + this.feed + "|" + mex);
     }
 

…er/rss_demo/adapters/AggregatorFeed.java …er/rss_demo/adapters/AggregatorFeed.javasrc/src_adapter/rss_demo/adapters/AggregatorFeed.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorFeed.java src/src_adapter/rss_demo/adapters/AggregatorFeed.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorFeed.java

@@ -21,9 +21,9 @@
 import java.util.HashMap;
 import java.util.Set;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Level;
 
 import com.lightstreamer.interfaces.data.IndexedItemEvent;
 
@@ -48,8 +48,7 @@ public class AggregatorUser {
 
     private RSSDataAdapter listener;
 
-    private static Logger logger =
-        Logger.getLogger("LS_demos_Logger.NewsAggregator.adapter");
+    private static Logger logger = LogManager.getLogger("LS_demos_Logger.NewsAggregator.adapter");
 
     /**
      * Constructor AggregatorUser.
@@ -347,7 +346,7 @@ public void notifyFeeds() {
         this.userLog("EXIT", Level.DEBUG);
     }
 
-    private void userLog(String mex, Priority level) {
+    private void userLog(String mex, Level level) {
         logger.log(level, "|" + this.userName + "|" + mex);
     }
 

…er/rss_demo/adapters/AggregatorUser.java …er/rss_demo/adapters/AggregatorUser.javasrc/src_adapter/rss_demo/adapters/AggregatorUser.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorUser.java src/src_adapter/rss_demo/adapters/AggregatorUser.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorUser.java

@@ -18,7 +18,8 @@
 
 package rss_demo.adapters;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Class AggregatorUserThread.
@@ -45,8 +46,7 @@ public class AggregatorUserThread extends Thread {
 
     private AggregatorFeed singleFeed = null;
 
-    private static Logger logger =
-        Logger.getLogger("LS_demos_Logger.NewsAggregator.adapter");
+    private static Logger logger = LogManager.getLogger("LS_demos_Logger.NewsAggregator.adapter");
 
     /**
      * Constructor AggregatorUserThread.

…_demo/adapters/AggregatorUserThread.java …_demo/adapters/AggregatorUserThread.javasrc/src_adapter/rss_demo/adapters/AggregatorUserThread.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorUserThread.java src/src_adapter/rss_demo/adapters/AggregatorUserThread.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/AggregatorUserThread.java

@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import rss_demo.rss_reader.RSSReaderProvider;
 
@@ -103,7 +103,7 @@ public void init(Map params, File configDir) throws DataProviderException {
         // is executed after log configuration was completed, this parameter 
         // must be present in the Adapter Set configuration (adapters.xml):
         // <metadata_adapter_initialised_first>Y</metadata_adapter_initialised_first>
-        logger = Logger.getLogger("LS_demos_Logger.NewsAggregator.adapter");
+        logger = LogManager.getLogger("LS_demos_Logger.NewsAggregator.adapter");
 
         // Read the Adapter Set name, which is supplied by the Server as a parameter
         String adapterSetId = (String) params.get("adapters_conf.id");

…er/rss_demo/adapters/RSSDataAdapter.java …er/rss_demo/adapters/RSSDataAdapter.javasrc/src_adapter/rss_demo/adapters/RSSDataAdapter.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/RSSDataAdapter.java src/src_adapter/rss_demo/adapters/RSSDataAdapter.java renamed to src/main/java/com/lightstreamer/src_adapter/rss_demo/adapters/RSSDataAdapter.java

@@ -18,8 +18,9 @@
 
 package rss_demo.rss_reader;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Level;
 
 import com.lightstreamer.interfaces.data.IndexedItemEvent;
 
@@ -34,8 +35,7 @@
  */
 class ErrorProducer extends Thread {
 
-    private static Logger logger =
-        Logger.getLogger("LS_demos_Logger.NewsAggregator.feed");
+    private static Logger logger = LogManager.getLogger("LS_demos_Logger.NewsAggregator.feed");
     private final RSSReaderProvider provider;
     //riferimento al produttore di notizie (ne viene sfruttato il semaforo)
     private RssProducer myRif;