Merge pull request #152 from italiangrid/v1.11.21

v1.11.21

etc/storm.properties.template

@@ -11,29 +11,18 @@
 ############################
 ###  SERVICE PARAMETERS  ###
 ############################
-##
-##  NOTE:
-##        The SERVICE PARAMETERS are managed also by YAIM. 
-##        So, if you install and configure the service with YAIM, please 
-##        remember that the parameters tagged as YAIM will be overwrite at every  
-##        reconfiguration done with YAIM, so if you want change some parameters 
-##        you should use the YAIM configuration files:
-##           <siteinfo_dir>/services/ig-se_storm_backend  (or equivalent)
-##
 
 # ============================
 # StoRM Service DNS
 # ============================
 # hostname with which the service is published
-#   <!! managed by YAIM; please read the above NOTE !!>
 storm.service.FE-public.hostname =
 
 
 # ============================
 # Front End service port
 # ============================
 # The Front End binding port
-#   <!! managed by YAIM; please read the above NOTE !!>
 storm.service.port = 8444
 
 # ============================
@@ -44,7 +33,6 @@ storm.service.port = 8444
 # These entries are used to check the SURL validity. 
 # storm.service.SURL.endpoint = srm://<surl-host>:<surl-port>/<surl-service-path>
 # Example: Example: srm://storm.cnaf.infn.it:8444/srm/managerv2
-#   <!! managed by YAIM; please read the above NOTE !!>
 storm.service.SURL.endpoint =   
 
 # ============================
@@ -55,27 +43,20 @@ storm.service.SURL.endpoint =
 # These entries are used to check the SURL validity. 
 # storm.service.SURL.default-ports = <surl-port>
 # Example: 8444
-#   <!! managed by YAIM; please read the above NOTE !!>
 storm.service.SURL.default-ports =   
 
 # ============================
 # FE/BE communication RDBMS
 # ============================
 #
 # Parameters to connect to the DB used as channel for the requests. 
-#   <!! managed by YAIM; please read the above NOTE !!>
 storm.service.request-db.host =  
 storm.service.request-db.username =   
 storm.service.request-db.passwd =  
 
 #############################################
 ############  PROFILE PARAMETERS ############
 #############################################
-##
-## NOTE: 
-##  The PROFILE PARAMETERS are not managed by YAIM in any case, 
-##  so any change must be managed by directly editing this file.
-##
 
 # ============================
 # StoRM Service Generic Behavior
@@ -119,17 +100,10 @@ default.storagetype = P
 #############################################
 ############  TUNING PARAMETERS #############
 #############################################
-##
-## NOTE: 
-##  The TUNING PARAMETERS are not managed by YAIM in any case, 
-##  so any change must be managed by directly editing this file.
-##
-
 
 # ============================
 # BE-private RDBMS
 # ============================
-persistence.internal-db.connection-pool = true
 persistence.internal-db.connection-pool.maxActive = 50
 persistence.internal-db.connection-pool.maxWait = 50
 
@@ -207,7 +181,6 @@ tape.recalltable.service.param.takeover=first
 # ============================
 # srmCopy parameters
 # ============================
-proxy.home=/opt/storm/backend/tmp
 asynch.srmclient.retrytime=60
 asynch.srmclient.timeout=180
 asynch.srmclient.sleeptime=5
@@ -292,4 +265,3 @@ storm.service.du.parallelTasks=false
 storm.service.du.delaySecs=60
 # Interval of execution of the du in seconds. Default: 86400s (24h)
 storm.service.du.periodSecs=86400
-ß

etc/systemd/storm-backend-server.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=StoRM Backend service
+After=mariadb.service
 
 [Service]
 WorkingDirectory=/etc/storm/backend-server

pom.xml

@@ -5,7 +5,7 @@
   <name>StoRM Backend server</name>
   <groupId>org.italiangrid.storm</groupId>
   <artifactId>storm-backend-server</artifactId>
-  <version>1.12.0</version>
+  <version>1.11.21</version>
 
   <properties>
 
@@ -39,7 +39,7 @@
 
     <guavaVersion>18.0</guavaVersion>
     <metrics.version>3.1.0</metrics.version>
-    <xercesImplVersion>2.11.0</xercesImplVersion>
+    <xercesImplVersion>2.12.1</xercesImplVersion>
 
     <mockitoVersion>1.10.19</mockitoVersion>
     <hamcrestVersion>1.3</hamcrestVersion>

src/main/java/it/grid/storm/catalogs/BoLChunkDAO.java

@@ -69,7 +69,7 @@ public class BoLChunkDAO {
 	/** String with the name of the class for the DB driver */
 	private final String driver = Configuration.getInstance().getDBDriver();
 	/** String referring to the URL of the DB */
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 	/** String with the password for the DB */
 	private final String password = Configuration.getInstance().getDBPassword();
 	/** String with the name for the DB */

src/main/java/it/grid/storm/catalogs/CopyChunkDAO.java

@@ -56,7 +56,7 @@ public class CopyChunkDAO {
 	/* String with the name of the class for the DB driver */
 	private final String driver = Configuration.getInstance().getDBDriver();
 	/* String referring to the URL of the DB */
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 	/* String with the password for the DB */
 	private final String password = Configuration.getInstance().getDBPassword();
 	/* String with the name for the DB */

src/main/java/it/grid/storm/catalogs/PtGChunkDAO.java

@@ -71,7 +71,7 @@ public class PtGChunkDAO {
 	/** String with the name of the class for the DB driver */
 	private final String driver = Configuration.getInstance().getDBDriver();
 	/** String referring to the URL of the DB */
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 	/** String with the password for the DB */
 	private final String password = Configuration.getInstance().getDBPassword();
 	/** String with the name for the DB */

src/main/java/it/grid/storm/catalogs/PtPChunkDAO.java

@@ -73,7 +73,7 @@ public class PtPChunkDAO {
 	/* String with the name of the class for the DB driver */
 	private final String driver = Configuration.getInstance().getDBDriver();
 	/* String referring to the URL of the DB */
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 	/* String with the password for the DB */
 	private final String password = Configuration.getInstance().getDBPassword();
 	/* String with the name for the DB */

src/main/java/it/grid/storm/catalogs/RequestSummaryDAO.java

@@ -57,7 +57,7 @@ public class RequestSummaryDAO {
 	/** String with the name of the class for the DB driver */
 	private final String driver = Configuration.getInstance().getDBDriver();
 	/** String referring to the URL of the DB */
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 	/** String with the password for the DB */
 	private final String password = Configuration.getInstance().getDBPassword();
 	/** String with the name for the DB */

src/main/java/it/grid/storm/catalogs/StoRMDataSource.java

@@ -169,7 +169,7 @@ public static synchronized void init(){
      Configuration conf = Configuration.getInstance();
      instance = new StoRMDataSource.Builder()
        .driver(conf.getDBDriver())
-       .url(conf.getDBURL())
+       .url(conf.getStormDbURL())
        .username(conf.getDBUserName())
        .password(conf.getDBPassword())
        .build();

src/main/java/it/grid/storm/catalogs/VolatileAndJiTDAO.java

@@ -54,7 +54,7 @@ public class VolatileAndJiTDAO {
 	private final String driver = Configuration.getInstance().getDBDriver();
 
 	// The URL of the DB
-	private final String url = Configuration.getInstance().getDBURL();
+	private final String url = Configuration.getInstance().getStormDbURL();
 
 	// The password for the DB
 	private final String password = Configuration.getInstance().getDBPassword();