From 14c93a42e1e30c446e4b37c0142e08d00509e603 Mon Sep 17 00:00:00 2001
From: "enrico.ottonello" <enrico.ottonello@isti.cnr.it>
Date: Fri, 12 Jul 2019 18:15:03 +0200
Subject: [PATCH] incremented log level deleted not required dependency

---
 dnet-ariadneplus-container/.factorypath       | 20 +++++++++----------
 dnet-ariadneplus-container/pom.xml            |  6 +++---
 .../resources/eu/dnetlib/cnr-site.properties  |  2 +-
 .../src/main/resources/log4j.properties       |  3 ++-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dnet-ariadneplus-container/.factorypath b/dnet-ariadneplus-container/.factorypath
index 46f5382..cdd1d9d 100644
--- a/dnet-ariadneplus-container/.factorypath
+++ b/dnet-ariadneplus-container/.factorypath
@@ -31,10 +31,8 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.3.3/jackson-databind-2.3.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient-cache/4.2.6/httpclient-cache-4.2.6.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.6/jcl-over-slf4j-1.7.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.16.16/lombok-1.16.16.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/eu/dnetlib/dnet-data-services/2.0.1-SAXONHE-SNAPSHOT/dnet-data-services-2.0.1-SAXONHE-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/eu/dnetlib/dnet-core-components/2.0.1-SAXONHE-SNAPSHOT/dnet-core-components-2.0.1-SAXONHE-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/quartz-scheduler/quartz/2.2.2/quartz-2.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/4.2.5.RELEASE/spring-context-support-4.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -49,16 +47,15 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient/4.4.1/httpclient-4.4.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-codec/commons-codec/1.8/commons-codec-1.8.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jaxen/jaxen/1.1.6/jaxen-1.1.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/ximpleware/vtd-xml/2.13.4/vtd-xml-2.13.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/mycila/xmltool/3.3/xmltool-3.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/joda-time/joda-time/2.10.2/joda-time-2.10.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/joda-time/joda-time/2.10.3/joda-time-2.10.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-test/4.2.5.RELEASE/spring-test-4.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/eu/dnetlib/dnet-core-services/2.0.1-SAXONHE-SNAPSHOT/dnet-core-services-2.0.1-SAXONHE-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/groovy/groovy-all/2.4.6/groovy-all-2.4.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/mongodb/mongo-java-driver/3.4.2/mongo-java-driver-3.4.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-net/commons-net/3.3/commons-net-3.3.jar" enabled="true" runInBatchMode="false"/>
@@ -117,18 +114,19 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-dbcp2/2.1.1/commons-dbcp2-2.1.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-pool2/2.4.2/commons-pool2-2.4.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/eu/dnetlib/dnet-data-provision-services/2.0.1-SAXONHE-SNAPSHOT/dnet-data-provision-services-2.0.1-SAXONHE-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/typesafe/config/1.3.0/config-1.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/typesafe/akka/akka-actor/2.0.4/akka-actor-2.0.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/solr/solr-solrj/5.5.0/solr-solrj-5.5.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpmime/4.4.1/httpmime-4.4.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/solr/solr-solrj/7.7.2/solr-solrj-7.7.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/zookeeper/zookeeper/3.4.14/zookeeper-3.4.14.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.4.1/woodstox-core-asl-4.4.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/noggit/noggit/0.6/noggit-0.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/noggit/noggit/0.8/noggit-0.8.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.24/jcl-over-slf4j-1.7.24.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/net/bull/javamelody/javamelody-core/1.65.0/javamelody-core-1.65.0.jar" enabled="true" runInBatchMode="false"/>
diff --git a/dnet-ariadneplus-container/pom.xml b/dnet-ariadneplus-container/pom.xml
index 85f823b..9285508 100644
--- a/dnet-ariadneplus-container/pom.xml
+++ b/dnet-ariadneplus-container/pom.xml
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>eu.dnetlib</groupId>
 			<artifactId>dnet-data-provision-services</artifactId>
-			<version>[2.0.0-SAXONHE-SNAPSHOT, 3.0.0-SAXON-SNAPSHOT)</version>
+			<version>2.0.1-SAXONHE-SOLR-772-SNAPSHOT</version>
 		</dependency>	
 		<dependency>
 			<groupId>xerces</groupId>
@@ -114,11 +114,11 @@
 			<version>[1.6.4]</version>
 		</dependency>
 		
-		<dependency>
+		<!--  <dependency>
 			<groupId>eu.dnetlib</groupId>
 			<artifactId>dnet-basic-aggregator</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
+		</dependency>-->
 
 	</dependencies>
 </project>
diff --git a/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties b/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties
index 9fe6781..6315d67 100644
--- a/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties
+++ b/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties
@@ -4,7 +4,7 @@ container.port                                  =   8280
 services.is.store.database.bean          		=   persistentExistDatabase
 #services.is.store.database.bean                = 	temporaryExistDatabase
 
-dnet.data.path 									=	/tmp/ariadneplus
+dnet.data.path 									=	/var/lib/ariadneplus
 dnet.bootstrap.schemas                          =   classpath*:/eu/dnetlib/bootstrap/schemas/**/*.xsd
 dnet.bootstrap.profiles                         =   classpath*:/eu/dnetlib/bootstrap/profiles/**/*.xml
 
diff --git a/dnet-ariadneplus-container/src/main/resources/log4j.properties b/dnet-ariadneplus-container/src/main/resources/log4j.properties
index 532aed3..d1b70b4 100644
--- a/dnet-ariadneplus-container/src/main/resources/log4j.properties
+++ b/dnet-ariadneplus-container/src/main/resources/log4j.properties
@@ -8,7 +8,7 @@ log4j.rootLogger=WARN, DNET
 #log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
 
 log4j.appender.DNET=org.apache.log4j.RollingFileAppender
-log4j.appender.DNET.File=${catalina.base}/logs/dnet.log
+log4j.appender.DNET.File=/var/log/ariadneplus/dnet.log
 log4j.appender.DNET.Append=true
 log4j.appender.DNET.Encoding=UTF-8
 log4j.appender.DNET.Threshold=ALL
@@ -37,3 +37,4 @@ log4j.logger.eu.dnetlib.ariadneplus.workflows.nodes=DEBUG
 log4j.logger.eu.dnetlib.ariadneplus.workflows.nodes.ClarinAPIGeneratorJobNode=DEBUG
 log4j.logger.eu.dnetlib.ariadneplus.workflows.nodes.ClarinFileVisitor=INFO
 
+log4j.logger.eu.dnetlib.index=DEBUG
\ No newline at end of file