From cfc105d60132172069ea93f4ef76cf6eec601b34 Mon Sep 17 00:00:00 2001 From: m.veroni Date: Tue, 26 Aug 2014 14:29:29 +0000 Subject: [PATCH] Aggiunto nuovo log con ZIP --- .classpath | 10 +++++----- conf/ADT/production/WEB-INF/web.xml | 4 ++-- conf/ADT/production/conf/log4j.xml | 20 +++++++++++++++++--- conf/ADT/production/version.xml | 6 +++--- conf/ADT/test-liliana/WEB-INF/web.xml | 4 ++-- conf/ADT/test-liliana/conf/log4j.xml | 20 +++++++++++++++++--- conf/ADT/test-liliana/version.xml | 6 +++--- conf/version.properties | 8 ++++---- deployer-script.xml | 9 ++++++++- lib/common/local/kahuna5j_4.2.3.jar | Bin 402084 -> 0 bytes lib/common/local/kahuna5j_4.3.0.jar | Bin 0 -> 404190 bytes src/conf/log4j.xml | 2 +- src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java | 10 +++++----- 13 files changed, 67 insertions(+), 32 deletions(-) delete mode 100644 lib/common/local/kahuna5j_4.2.3.jar create mode 100644 lib/common/local/kahuna5j_4.3.0.jar diff --git a/.classpath b/.classpath index 72c10d3..bf63ccd 100644 --- a/.classpath +++ b/.classpath @@ -118,11 +118,6 @@ - - - - - @@ -156,6 +151,11 @@ + + + + + diff --git a/conf/ADT/production/WEB-INF/web.xml b/conf/ADT/production/WEB-INF/web.xml index 017cd1f..45a4d5e 100644 --- a/conf/ADT/production/WEB-INF/web.xml +++ b/conf/ADT/production/WEB-INF/web.xml @@ -1,6 +1,6 @@ - FileProxy 1.0.3 (20) - ADT/production [30/07/2014 17:10] + FileProxy 1.0.8 (32) - ADT/production [26/08/2014 15:57] @@ -9,7 +9,7 @@ FileProxyServer ADT (production) - + ErrorPage diff --git a/conf/ADT/production/conf/log4j.xml b/conf/ADT/production/conf/log4j.xml index f99a928..85458ba 100644 --- a/conf/ADT/production/conf/log4j.xml +++ b/conf/ADT/production/conf/log4j.xml @@ -8,7 +8,8 @@ - + + @@ -21,11 +22,24 @@ - + + + + + + + + + + + + + + - + diff --git a/conf/ADT/production/version.xml b/conf/ADT/production/version.xml index 42420dc..68472e5 100644 --- a/conf/ADT/production/version.xml +++ b/conf/ADT/production/version.xml @@ -3,10 +3,10 @@ Version information - 1.0.3 + 1.0.8 - 20 - 30/07/2014 17:10 + 32 + 26/08/2014 15:57 ADT/production diff --git a/conf/ADT/test-liliana/WEB-INF/web.xml b/conf/ADT/test-liliana/WEB-INF/web.xml index f2258b4..8fb276d 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.3 (21) - ADT/test-liliana [30/07/2014 17:15] + FileProxy 1.0.8 (31) - ADT/test-liliana [26/08/2014 15:37] @@ -9,7 +9,7 @@ FileProxyServer ADT (test) - + ErrorPage diff --git a/conf/ADT/test-liliana/conf/log4j.xml b/conf/ADT/test-liliana/conf/log4j.xml index 9ff80ce..32879eb 100644 --- a/conf/ADT/test-liliana/conf/log4j.xml +++ b/conf/ADT/test-liliana/conf/log4j.xml @@ -8,7 +8,8 @@ - + + @@ -21,12 +22,25 @@ - + + + + + + + + + + + + + + - + diff --git a/conf/ADT/test-liliana/version.xml b/conf/ADT/test-liliana/version.xml index dd184f4..f867ff8 100644 --- a/conf/ADT/test-liliana/version.xml +++ b/conf/ADT/test-liliana/version.xml @@ -3,10 +3,10 @@ Version information - 1.0.3 + 1.0.8 - 21 - 30/07/2014 17:15 + 31 + 26/08/2014 15:37 ADT/test-liliana diff --git a/conf/version.properties b/conf/version.properties index eaf2f82..4347009 100644 --- a/conf/version.properties +++ b/conf/version.properties @@ -1,6 +1,6 @@ #Build Number for ANT. Do not edit! -#Wed Jul 30 17:15:29 CEST 2014 -build.number=22 +#Tue Aug 26 15:57:19 CEST 2014 +build.number=33 version.release= -build.date=30/07/2014 17\:15 -version.number=1.0.3 +build.date=26/08/2014 15\:57 +version.number=1.0.8 diff --git a/deployer-script.xml b/deployer-script.xml index 8053147..95b1dfc 100644 --- a/deployer-script.xml +++ b/deployer-script.xml @@ -279,9 +279,16 @@ * context = ${context} * war (locale) = ${warfile.name} + + + + cd ${remote.path} && tomcat-deploy -u -f + + + - cd ${remote.path} && tomcat-deploy -c -f + cd ${remote.path} && tomcat-deploy -f Deploy completato su tutti i nodi diff --git a/lib/common/local/kahuna5j_4.2.3.jar b/lib/common/local/kahuna5j_4.2.3.jar deleted file mode 100644 index 2c227d5..0000000 Binary files a/lib/common/local/kahuna5j_4.2.3.jar and /dev/null differ diff --git a/lib/common/local/kahuna5j_4.3.0.jar b/lib/common/local/kahuna5j_4.3.0.jar new file mode 100644 index 0000000..0bf4038 Binary files /dev/null and b/lib/common/local/kahuna5j_4.3.0.jar differ diff --git a/src/conf/log4j.xml b/src/conf/log4j.xml index bfbceff..ccf9b26 100644 --- a/src/conf/log4j.xml +++ b/src/conf/log4j.xml @@ -79,7 +79,7 @@ - + diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java index 9785796..20ec2a8 100644 --- a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java +++ b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java @@ -1,8 +1,6 @@ package it.softecspa.fileproxy.proxyservices.manager.core; import it.softecspa.database.dbconnect.ConnectionManager; -import it.softecspa.database.dbconnect.DatabaseStatementUnplugged; -import it.softecspa.database.dbconnect.NoRecordFoundException; import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest; import it.softecspa.fileproxy.services.ServerCacheFactory; import it.softecspa.fileproxy.services.common.CheckerException; @@ -13,7 +11,6 @@ import it.softecspa.jwebber.bo.Utente; import it.softecspa.kahuna.lang.XString; import it.softecspa.mvc.businessobject.DatabaseManager; import it.softecspa.mvc.exceptions.AuthenticationException; -import it.softecspa.portal.Parameters; import java.sql.Connection; import java.sql.SQLException; @@ -66,7 +63,10 @@ public class WorkflowSession extends Universal } finally { DatabaseManager.closeConnection(connection); } - + + /* + * Eliminato per velocizzare la richiesta + * E' fatta solo la verifica del'utente Parameters parameters = Parameters.getInstance(); if (!utente.hasPolicy(parameters.get("POL_SA","SA")) && @@ -75,7 +75,7 @@ public class WorkflowSession extends Universal log.error("Not valid policy for username '"+request.getUsername()+"'"); throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID); } - + */ -- libgit2 0.21.4