diff --git a/conf/ADT/test-liliana/WEB-INF/web.xml b/conf/ADT/test-liliana/WEB-INF/web.xml index a379f4f..a713bef 100644 --- a/conf/ADT/test-liliana/WEB-INF/web.xml +++ b/conf/ADT/test-liliana/WEB-INF/web.xml @@ -1,6 +1,6 @@ - FileProxy 1.0.0 (7) - ADT/test-liliana [27/06/2014 17:20] + FileProxy 1.0.2 (11) - ADT/test-liliana [07/07/2014 15:08] @@ -9,7 +9,7 @@ FileProxyServer ADT (test) - + ErrorPage diff --git a/conf/ADT/test-liliana/version.xml b/conf/ADT/test-liliana/version.xml index bc5d9ed..5f59844 100644 --- a/conf/ADT/test-liliana/version.xml +++ b/conf/ADT/test-liliana/version.xml @@ -3,10 +3,10 @@ Version information - 1.0.0 + 1.0.2 - 7 - 27/06/2014 17:20 + 11 + 07/07/2014 15:08 ADT/test-liliana diff --git a/conf/version.properties b/conf/version.properties index c24ae1c..48d39cf 100644 --- a/conf/version.properties +++ b/conf/version.properties @@ -1,6 +1,6 @@ #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 diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java index dcfae3a..61c6df8 100644 --- a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java +++ b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java @@ -61,13 +61,18 @@ public class WorkflowSession 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); } + } diff --git a/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java b/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java index 238e72d..2120de1 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java @@ -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; diff --git a/src/it/softecspa/fileproxy/proxyservices/request/DeleteRequestType.java b/src/it/softecspa/fileproxy/proxyservices/request/DeleteRequestType.java index 678a5cb..ad4f98c 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/DeleteRequestType.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/DeleteRequestType.java @@ -1,5 +1,7 @@ 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()) + }; + } } diff --git a/src/it/softecspa/fileproxy/proxyservices/request/DownloadRequestType.java b/src/it/softecspa/fileproxy/proxyservices/request/DownloadRequestType.java index 10c6ed9..1700d44 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/DownloadRequestType.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/DownloadRequestType.java @@ -1,5 +1,7 @@ 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()) + }; + } + } diff --git a/src/it/softecspa/fileproxy/proxyservices/request/ListRequestType.java b/src/it/softecspa/fileproxy/proxyservices/request/ListRequestType.java index eaf9181..047301d 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/ListRequestType.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/ListRequestType.java @@ -1,5 +1,7 @@ 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()) + }; + } } diff --git a/src/it/softecspa/fileproxy/proxyservices/request/MakeFolderRequestType.java b/src/it/softecspa/fileproxy/proxyservices/request/MakeFolderRequestType.java index 2d79663..2e503ab 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/MakeFolderRequestType.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/MakeFolderRequestType.java @@ -1,5 +1,7 @@ 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()) + }; + } } diff --git a/src/it/softecspa/fileproxy/proxyservices/request/UploadRequestType.java b/src/it/softecspa/fileproxy/proxyservices/request/UploadRequestType.java index d0059e4..53862ee 100644 --- a/src/it/softecspa/fileproxy/proxyservices/request/UploadRequestType.java +++ b/src/it/softecspa/fileproxy/proxyservices/request/UploadRequestType.java @@ -1,11 +1,12 @@ 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, 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()) + }; + } + } diff --git a/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java b/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java index 506c42a..ea03031 100644 --- a/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java +++ b/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java @@ -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!") //----------------- diff --git a/src/it/softecspa/fileproxy/services/common/core/response/Entry.java b/src/it/softecspa/fileproxy/services/common/core/response/Entry.java index e2c811c..853276e 100644 --- a/src/it/softecspa/fileproxy/services/common/core/response/Entry.java +++ b/src/it/softecspa/fileproxy/services/common/core/response/Entry.java @@ -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; } -- libgit2 0.21.4