Aggiunto username nel log delgi statements

git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13344 edf0334f-4afc-450a-8f92-fe1409970e7d

Aggiunto username nel log delgi statements
git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13344 edf0334f-4afc-450a-8f92-fe1409970e7d
m.veroni
1 parent ba50a4dd
Showing 12 changed files with 81 additions and 17 deletions Show diff stats
conf/ADT/test-liliana/WEB-INF/web.xml
conf/ADT/test-liliana/version.xml
conf/version.properties
src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java
src/it/softecspa/fileproxy/proxyservices/request/DeleteRequestType.java
src/it/softecspa/fileproxy/proxyservices/request/DownloadRequestType.java
src/it/softecspa/fileproxy/proxyservices/request/ListRequestType.java
src/it/softecspa/fileproxy/proxyservices/request/MakeFolderRequestType.java
src/it/softecspa/fileproxy/proxyservices/request/UploadRequestType.java
src/it/softecspa/fileproxy/services/common/ResponseOutcome.java
src/it/softecspa/fileproxy/services/common/core/response/Entry.java
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>FileProxy 1.0.0 (7) - ADT/test-liliana [27/06/2014 17:20]</display-name>
+	<display-name>FileProxy 1.0.2 (11) - ADT/test-liliana [07/07/2014 15:08]</display-name>
 	<!-- Ultime modifiche del 23/06/2014 -->
 	<!-- Configurazione per New Relic -->
@@ -9,7 +9,7 @@
 		  <param-value>FileProxyServer ADT (test)</param-value>
 	</context-param>	
-	<!-- ADT/test-liliana - 27/06/2014 17:20 -->
+	<!-- ADT/test-liliana - 07/07/2014 15:08 -->
 	<!-- Configurazioni obbligatorie -->
 	<context-param>
 		<param-name>ErrorPage</param-name>
@@ -3,10 +3,10 @@
 <properties>
 	<comment>Version information</comment>
-	<entry key="version.number">1.0.0</entry> 				
+	<entry key="version.number">1.0.2</entry> 				
 	<entry key="version.release"></entry>
-	<entry key="build.number">7</entry> 			
-	<entry key="build.date">27/06/2014 17:20</entry>
+	<entry key="build.number">11</entry> 			
+	<entry key="build.date">07/07/2014 15:08</entry>
 	<entry key="build.installation">ADT/test-liliana</entry>
 </properties>
 #Build Number for ANT. Do not edit!
-#Fri Jun 27 17:20:50 CEST 2014
-build.number=8
+#Mon Jul 07 15:08:58 CEST 2014
+build.number=12
 version.release=
-build.date=27/06/2014 17\:20
-version.number=1.0.0
+build.date=07/07/2014 15\:08
+version.number=1.0.2
@@ -61,13 +61,18 @@ public class WorkflowSession&lt;I extends GlobalHttpProxyRequest&gt; extends Universal
 		} catch (SQLException e) {
 			throw new ManagerException(e);
-		
+			
 		} catch (AuthenticationException e) {
 			log.error("Error check credential with username '"+request.getUsername()+"': "+e.getMessage());
 			// Username/Password non validi
 			throw new CheckerException(ResponseOutcome.USER_PASSWORD_NO_VALID);
+			
+		} catch (Exception e) {
+			log.error("Error in check user checking",e);
+			throw new CheckerException(ResponseOutcome.USER_NOT_VERIFY_RETRY);
 		}
+		
 	}
@@ -5,10 +5,10 @@ import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest;
 import it.softecspa.fileproxy.services.common.comunicator.http.HttpRemote;
 import it.softecspa.fileproxy.services.common.core.request.Protocollo;
 import it.softecspa.fileproxy.services.common.core.request.RemoteHostRequestInfo;
-import it.softecspa.fileproxy.services.common.core.request.TrackRequestInfo;
+import it.softecspa.fileproxy.services.common.core.request.TrackRequestCustomInfo;
-public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyRequest, RemoteHostRequestInfo, TrackRequestInfo {
+public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyRequest, RemoteHostRequestInfo, /*TrackRequestInfo*/ TrackRequestCustomInfo {
 	// UniversalRequest
 	private String language;
 package it.softecspa.fileproxy.proxyservices.request;
+import it.softecspa.fileproxy.services.common.core.response.Entry;
+
 public class DeleteRequestType extends AbstractHttpFileProxyRequest{
@@ -22,5 +24,13 @@ public class DeleteRequestType extends AbstractHttpFileProxyRequest{
 	public void setPath(String path) {
 		this.path = path;
 	}
+	
+	@Override
+	public Entry[] takeCustomEntry() {
+		return new Entry[] { new Entry("username", getUsername())
+		   				   , new Entry("path", getPath())
+		   				   , new Entry("filename", getFileName())
+						    };
+	}
 }
 package it.softecspa.fileproxy.proxyservices.request;
+import it.softecspa.fileproxy.services.common.core.response.Entry;
+
 public class DownloadRequestType extends AbstractHttpFileProxyRequest{
@@ -41,4 +43,14 @@ public class DownloadRequestType extends AbstractHttpFileProxyRequest{
 		this.inline = inline;
 	}
+	@Override
+	public Entry[] takeCustomEntry() {
+		return new Entry[] { new Entry("username", getUsername())
+						   , new Entry("path", getPath())
+						   , new Entry("filename", getFileName())
+						   , new Entry("inline", getInline())
+						   , new Entry("chunk", getChunk())
+						   };
+	}
+	
 }
 package it.softecspa.fileproxy.proxyservices.request;
+import it.softecspa.fileproxy.services.common.core.response.Entry;
+
 public class ListRequestType extends AbstractHttpFileProxyRequest{
@@ -31,4 +33,13 @@ public class ListRequestType extends AbstractHttpFileProxyRequest{
 		this.showHidden = showHidden;
 	}
+	
+	@Override
+	public Entry[] takeCustomEntry() {
+		return new Entry[] { new Entry("username", getUsername())
+						   , new Entry("path", getPath())
+						   , new Entry("onlyFile", getOnlyFile())
+						   , new Entry("showHidden", getShowHidden())
+						   };
+	}
 }
 package it.softecspa.fileproxy.proxyservices.request;
+import it.softecspa.fileproxy.services.common.core.response.Entry;
+
 public class MakeFolderRequestType extends AbstractHttpFileProxyRequest{
@@ -9,9 +11,15 @@ public class MakeFolderRequestType extends AbstractHttpFileProxyRequest{
 		return path;
 	}
-	public void setPath(String filename) {
-		this.path = filename;
+	public void setPath(String path) {
+		this.path = path;
 	}
+	@Override
+	public Entry[] takeCustomEntry() {
+		return new Entry[] { new Entry("username", getUsername())
+						   , new Entry("path", getPath())
+						   };
+	}
 }
 package it.softecspa.fileproxy.proxyservices.request;
-import java.io.InputStream;
-
 import it.softecspa.fileproxy.services.common.core.request.InputStreamReaderXML;
 import it.softecspa.fileproxy.services.common.core.request.MethodPostMandatory;
+import it.softecspa.fileproxy.services.common.core.response.Entry;
 import it.softecspa.kahuna.util.xml.XmlRoot;
+import java.io.InputStream;
+
 public class UploadRequestType extends AbstractHttpFileProxyRequest implements InputStreamReaderXML<XmlRoot>, MethodPostMandatory {
 	private Boolean overwrite;
@@ -92,4 +93,16 @@ public class UploadRequestType extends AbstractHttpFileProxyRequest implements I
 		this.append = append;
 	}
+	@Override
+	public Entry[] takeCustomEntry() {
+		return new Entry[] { new Entry("username", getUsername())
+						   , new Entry("path", getPath())
+						   , new Entry("filename", getFileName())
+						   , new Entry("overwrite", getOverwrite())
+						   , new Entry("append", getAppend())
+						   , new Entry("bufferLength", getBufferLength()) 
+						   , new Entry("encoding", getEncoding())
+						   };
+	}
+
 }
@@ -440,7 +440,7 @@ public enum ResponseOutcome {
 		, DIRECTORY_JUST_EXIST				(30008,"Directory just exist")	
 		, ERROR_CREATING_DIR				(30009,"Error creating directory")
 		, FOUND_NOT_VALID_CHAR				(30010,"Found not valid char in path or filename")
-		
+		, USER_NOT_VERIFY_RETRY				(30011,"Error in user verification, retry!")
 		//-----------------
@@ -15,6 +15,11 @@ public class Entry {
 		this.value = (value!=null?value.toString():null);
 	}
+	public Entry(String key, Boolean value) {
+		this.key = key;
+		this.value = (value!=null?value.toString():null);
+	}
+	
 	public String getKey() {
 		return key;
 	}