Merge pull request #26 from italiangrid/develop

Update master to 1.11.4 release

.gitignore

@@ -4,3 +4,4 @@
 .checkstyle
 target
 src/main/java/rebel*.xml
+/bin

etc/storm.properties.template

@@ -249,14 +249,5 @@ purge.size=800
 #Time after that the GC consider a _terminated_ request as garbage
 expired.request.time=86400
 
-
-#############################################
-############  PRIVATE PARAMETERS ############
-#############################################
-# ==========================================
-# -- READ ONLY Properties
-# ==========================================
-#
-# READ ONLY key; please don't edit that value
-storm.properties.version = $Revision$
-#
+# Skip ACL setup for PtG requests
+ptg.skip-acl-setup = false

pom.xml

@@ -5,7 +5,7 @@
 	<name>StoRM Backend server</name>
 	<groupId>org.italiangrid.storm</groupId>
 	<artifactId>storm-backend-server</artifactId>
-	<version>1.11.3</version>
+	<version>1.11.4</version>
 
 	<properties>
 
@@ -66,7 +66,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.13</version>
 				<configuration>
-					<!-- skips tests by default, until we have not reviewed them and make 
+					<!-- skips tests by default, until we have not reviewed them and make
 						sure they work -->
 					<skipTests>true</skipTests>
 				</configuration>
@@ -93,12 +93,12 @@
 				</executions>
 			</plugin>
 
-			<!-- Enable the wagon plugin (which in turn need some work from the dependency plugin) 
-				to deploy to a remote machine. It copies over ssh the storm-backend-server 
+			<!-- Enable the wagon plugin (which in turn need some work from the dependency plugin)
+				to deploy to a remote machine. It copies over ssh the storm-backend-server
 				jar, the dependency jars, and all configuration files except those that are
 				not supposed to be overwritten by a re-deployment, i.e. those that are marked
 				config noreplace in the rpm -->
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -116,7 +116,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
@@ -132,7 +132,7 @@
 							<url>${remoteDeployment.url}/</url>
 							<serverId>${remoteDeployment.serverId}</serverId>
 							<fromDir>etc</fromDir>
-							<!-- exclude config files that might have edited remotely, the same 
+							<!-- exclude config files that might have edited remotely, the same
 								that are marked config noreplace in rpm -->
 							<excludes>
 								logging.xml, namespace.xml, path-authz.db,
@@ -180,7 +180,7 @@
 							<toDir>/etc/logrotate.d</toDir>
 						</configuration>
 					</execution>
-                    
+
 					<execution>
 						<id>upload-deps</id>
 						<phase>deploy</phase>
@@ -195,7 +195,7 @@
 							<toDir>/usr/share/java/storm-backend-server</toDir>
 						</configuration>
 					</execution>
-                    
+
 					<execution>
 						<id>upload-jar</id>
 						<phase>deploy</phase>
@@ -210,10 +210,10 @@
 							<toDir>/usr/share/java/storm-backend-server</toDir>
 						</configuration>
 					</execution>
-					
+
 				</executions>
 			</plugin>
-			
+
 			<!-- needed so that mvn is not going to try to deploy (classic maven deploy),
 				because we are using mvn deploy to deploy the complete project to a remote machine
 				in development -->
@@ -351,10 +351,10 @@
 			<version>${jsonVersion}</version>
 		</dependency>
 
-		<!-- not on Maven Central, we have it on our own repository, you can install 
-			it from official releases http://dev.globus.org/wiki/CoG_JGlobus_1.4. The 
-			artifacts not prefix with cog are dependencies. As all of them are very old, 
-			and not supported, we have installed the versions distributed with CoG, with 
+		<!-- not on Maven Central, we have it on our own repository, you can install
+			it from official releases http://dev.globus.org/wiki/CoG_JGlobus_1.4. The
+			artifacts not prefix with cog are dependencies. As all of them are very old,
+			and not supported, we have installed the versions distributed with CoG, with
 			the CoG version and groupID -->
 		<dependency>
 			<groupId>org.globus</groupId>
@@ -402,7 +402,7 @@
 			<version>${cogGlobusVersion}</version>
 		</dependency>
 
-		<!-- not on Maven Central, we have it on our own repository, taken form 
+		<!-- not on Maven Central, we have it on our own repository, taken form
 			the lib directory of the old src code repository https://github.com/italiangrid/storm/commits/BE_1.11/lib/srm22client.jar -->
 		<dependency>
 			<groupId>srm22client</groupId>
@@ -473,7 +473,7 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- not on Maven Central, we have it on our own repository, you can install 
+		<!-- not on Maven Central, we have it on our own repository, you can install
 			it from official releases http://archive.apache.org/dist/jakarta/oro/ -->
 		<dependency>
 			<groupId>org.apache.oro</groupId>

src/main/java/it/grid/storm/Constants.java

@@ -61,24 +61,22 @@ private static String getDistribution() {
 			+ "issue";
 		File issueFile = new File(issuePath);
 		if (!issueFile.exists() || !issueFile.isFile() || !issueFile.canRead()) {
-			log.warn("Unable to read " + issueFile.getAbsolutePath() + " file!!");
+			log.warn("Unable to read {} file!!", issueFile.getAbsolutePath());
 		} else {
 			try {
 				BufferedReader issueReader = new BufferedReader(new FileReader(
 					issueFile));
 				String output = issueReader.readLine();
 				if (output == null) {
-					log.warn("The file " + issueFile.getAbsolutePath() + " is empty!");
+					log.warn("The file {} is empty!", issueFile.getAbsolutePath());
 				} else {
 					distribution = output;
 				}
 				issueReader.close();
 			} catch (FileNotFoundException e) {
-				log.error("Unable to read file '" + issueFile.getAbsolutePath() + "'. "
-					+ e);
+				log.error("Unable to read file '{}'. {}", issueFile.getAbsolutePath(), e);
 			} catch (IOException e) {
-				log.error("Unable to read file '" + issueFile.getAbsolutePath() + "'."
-					+ e);
+				log.error("Unable to read file '{}'. {}", issueFile.getAbsolutePath(), e);
 			}
 		}
 		return distribution;
@@ -105,14 +103,14 @@ private static HashMap<String, String> getPlatformKernel() {
 				while (error != null) {
 					error += stdError.readLine();
 				}
-				log.error("Unable to invoke \'uname -ri\' . Standard error : " + error);
+				log.error("Unable to invoke \'uname -ri\' . Standard error : {}", error);
 			} else {
 				String[] fields = output.trim().split(" ");
 				map.put("kernelRelease", fields[0]);
 				map.put("platform", fields[1]);
 			}
 		} catch (IOException e) {
-			log.error("Unable to invoke \'uname -ri\' . IOException " + e);
+			log.error("Unable to invoke \'uname -ri\' . IOException {}", e);
 		}
 		return map;
 	}

src/main/java/it/grid/storm/StoRM.java

@@ -145,10 +145,9 @@ private void configureXMLRPCService(){
 
 		} catch (StoRMXmlRpcException e) {
 
-			log.error("Unable to create the XML-RPC Server. StoRMXmlRpcException: "
-				+ e.getMessage());
+			log.error(e.getMessage(), e);
 
-			throw new RuntimeException("Unable to create the XML-RPC Server", e);
+			throw new RuntimeException(e.getMessage(), e);
 		}
 
 	}
@@ -281,11 +280,11 @@ synchronized public void startRestServer() throws Exception {
 		try {
 			RestService.startServer();
 		} catch (IOException e) {
-			log.error("Unable to start internal HTTP Server listening for RESTFul services. IOException : "
-					+ e.getMessage());
-			throw new Exception(
-				"Unable to start internal HTTP Server listening for RESTFul services. IOException : "
-					+ e.getMessage());
+
+			String emsg = String.format("Unable to start internal HTTP Server "
+				+ "listening for RESTFul services. IOException : %s", e.getMessage());
+			log.error(emsg, e);
+			throw new Exception(emsg);
 		}
 		this.isRestServerRunning = true;
 	}
@@ -301,8 +300,8 @@ synchronized public void stopRestServer() {
 
 		} catch (Exception e) {
 
-			log.error("Unable to stop internal HTTP Server listening for RESTFul services: "
-					+ e.getMessage());
+			log.error("Unable to stop internal HTTP Server listening for RESTFul "
+				+ "services: {}", e.getMessage(), e);
 		}
 
 		this.isRestServerRunning = false;