diff --git a/WebContent/META-INF/JCLUSTER (web77db12).txt b/WebContent/META-INF/JCLUSTER (web77db12).txt
new file mode 100644
index 0000000..9d3e3a3
--- /dev/null
+++ b/WebContent/META-INF/JCLUSTER (web77db12).txt
@@ -0,0 +1 @@
+context.xml from D:\Sviluppo\Desktopmate\FileProxyServer/conf/myMETA-INF/context-jcluster-web77db12.xml
\ No newline at end of file
diff --git a/WebContent/META-INF/LILIANA (web144db2).txt b/WebContent/META-INF/LILIANA (web144db2).txt
deleted file mode 100644
index bc0e4dc..0000000
--- a/WebContent/META-INF/LILIANA (web144db2).txt
+++ /dev/null
@@ -1 +0,0 @@
-context.xml from D:\Sviluppo\Desktopmate\FileProxyServer/conf/myMETA-INF/context-liliana-web144db2.xml
\ No newline at end of file
diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 2fac333..05fbb2a 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -3,45 +3,43 @@
antiResourceLocking="false"
distributable="true"
reloadable="false" crossContext="false">
-
+
-
-
-
+
+
+
+
-
- WEB-INF/web.xml
+ WEB-INF/web.xml
-
+
-
-
+
-
-
+ jdbcUrl="jdbc:mysql://localhost:3306/web77db12?autoReconnect=true&characterEncoding=UTF-8" />
+
diff --git a/conf/ADT/production/META-INF/context.xml b/conf/ADT/production/META-INF/context.xml
index 10d7465..4b81c5b 100644
--- a/conf/ADT/production/META-INF/context.xml
+++ b/conf/ADT/production/META-INF/context.xml
@@ -15,17 +15,17 @@
description="DB Connection"
driverClass="com.mysql.jdbc.Driver"
- initialPoolSize="2"
- minPoolSize="2"
- maxPoolSize="10"
- acquireIncrement="2"
+ initialPoolSize="1"
+ minPoolSize="1"
+ maxPoolSize="15"
+ acquireIncrement="1"
- checkoutTimeout="3600"
+ checkoutTimeout="10000"
breakAfterAcquireFailure="false"
- maxIdleTimeExcessConnections = "30"
- maxIdleTime = "1800"
- maxConnectionAge="3600"
- idleConnectionTestPeriod="200"
+ maxIdleTimeExcessConnections = "15"
+ maxIdleTime = "30"
+ maxConnectionAge="120"
+ idleConnectionTestPeriod="30"
user="web77u12"
password="Ghec56hj"
diff --git a/conf/ADT/production/WEB-INF/web.xml b/conf/ADT/production/WEB-INF/web.xml
index 1592699..017cd1f 100644
--- a/conf/ADT/production/WEB-INF/web.xml
+++ b/conf/ADT/production/WEB-INF/web.xml
@@ -1,6 +1,6 @@
- FileProxy 1.0.2 (17) - ADT/production [15/07/2014 14:39]
+ FileProxy 1.0.3 (20) - ADT/production [30/07/2014 17:10]
@@ -9,7 +9,7 @@
FileProxyServer ADT (production)
-
+
ErrorPage
diff --git a/conf/ADT/production/version.xml b/conf/ADT/production/version.xml
index e9a0449..42420dc 100644
--- a/conf/ADT/production/version.xml
+++ b/conf/ADT/production/version.xml
@@ -3,10 +3,10 @@
Version information
- 1.0.2
+ 1.0.3
- 17
- 15/07/2014 14:39
+ 20
+ 30/07/2014 17:10
ADT/production
diff --git a/conf/ADT/test-liliana/META-INF/context.xml b/conf/ADT/test-liliana/META-INF/context.xml
index 2dfa4d9..f8826d3 100644
--- a/conf/ADT/test-liliana/META-INF/context.xml
+++ b/conf/ADT/test-liliana/META-INF/context.xml
@@ -18,17 +18,17 @@
description="DB Connection"
driverClass="com.mysql.jdbc.Driver"
- initialPoolSize="2"
- minPoolSize="2"
+ initialPoolSize="1"
+ minPoolSize="1"
maxPoolSize="10"
- acquireIncrement="2"
+ acquireIncrement="1"
- checkoutTimeout="3600"
+ checkoutTimeout="10000"
breakAfterAcquireFailure="false"
- maxIdleTimeExcessConnections = "30"
- maxIdleTime = "1800"
- maxConnectionAge="3600"
- idleConnectionTestPeriod="200"
+ maxIdleTimeExcessConnections = "15"
+ maxIdleTime = "30"
+ maxConnectionAge="120"
+ idleConnectionTestPeriod="30"
user="web144u2"
password="fdte5532"
diff --git a/conf/ADT/test-liliana/WEB-INF/web.xml b/conf/ADT/test-liliana/WEB-INF/web.xml
index a713bef..f2258b4 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.2 (11) - ADT/test-liliana [07/07/2014 15:08]
+ FileProxy 1.0.3 (21) - ADT/test-liliana [30/07/2014 17:15]
@@ -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 5f59844..dd184f4 100644
--- a/conf/ADT/test-liliana/version.xml
+++ b/conf/ADT/test-liliana/version.xml
@@ -3,10 +3,10 @@
Version information
- 1.0.2
+ 1.0.3
- 11
- 07/07/2014 15:08
+ 21
+ 30/07/2014 17:15
ADT/test-liliana
diff --git a/conf/myMETA-INF/context-jcluster-web77db12.xml b/conf/myMETA-INF/context-jcluster-web77db12.xml
index b692216..05fbb2a 100644
--- a/conf/myMETA-INF/context-jcluster-web77db12.xml
+++ b/conf/myMETA-INF/context-jcluster-web77db12.xml
@@ -22,17 +22,17 @@
description="DB Connection"
driverClass="com.mysql.jdbc.Driver"
- initialPoolSize="2"
- minPoolSize="2"
+ initialPoolSize="1"
+ minPoolSize="1"
maxPoolSize="10"
- acquireIncrement="2"
+ acquireIncrement="1"
- checkoutTimeout="3600"
+ checkoutTimeout="10000"
breakAfterAcquireFailure="false"
- maxIdleTimeExcessConnections = "30"
- maxIdleTime = "1800"
- maxConnectionAge="3600"
- idleConnectionTestPeriod="200"
+ maxIdleTimeExcessConnections = "15"
+ maxIdleTime = "30"
+ maxConnectionAge="120"
+ idleConnectionTestPeriod="30"
user="web77u12"
password="Ghec56hj"
diff --git a/conf/myMETA-INF/context-liliana-web144db2.xml b/conf/myMETA-INF/context-liliana-web144db2.xml
index 2fac333..14748b5 100644
--- a/conf/myMETA-INF/context-liliana-web144db2.xml
+++ b/conf/myMETA-INF/context-liliana-web144db2.xml
@@ -23,17 +23,17 @@
description="DB Connection"
driverClass="com.mysql.jdbc.Driver"
- initialPoolSize="2"
- minPoolSize="2"
+ initialPoolSize="1"
+ minPoolSize="1"
maxPoolSize="10"
- acquireIncrement="2"
+ acquireIncrement="1"
- checkoutTimeout="3600"
+ checkoutTimeout="10000"
breakAfterAcquireFailure="false"
- maxIdleTimeExcessConnections = "30"
- maxIdleTime = "1800"
- maxConnectionAge="3600"
- idleConnectionTestPeriod="200"
+ maxIdleTimeExcessConnections = "15"
+ maxIdleTime = "30"
+ maxConnectionAge="120"
+ idleConnectionTestPeriod="30"
user="web144u2"
password="fdte5532"
diff --git a/conf/version.properties b/conf/version.properties
index 0c84693..eaf2f82 100644
--- a/conf/version.properties
+++ b/conf/version.properties
@@ -1,6 +1,6 @@
#Build Number for ANT. Do not edit!
-#Tue Jul 15 14:39:20 CEST 2014
-build.number=18
+#Wed Jul 30 17:15:29 CEST 2014
+build.number=22
version.release=
-build.date=15/07/2014 14\:39
-version.number=1.0.2
+build.date=30/07/2014 17\:15
+version.number=1.0.3
diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
index 61c6df8..9785796 100644
--- a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
+++ b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
@@ -2,6 +2,7 @@ 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;
@@ -10,9 +11,11 @@ import it.softecspa.fileproxy.services.common.ResponseOutcome;
import it.softecspa.fileproxy.services.common.core.UniversalSession;
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;
public class WorkflowSession extends UniversalSession {
@@ -45,32 +48,35 @@ public class WorkflowSession extends Universal
throw new ManagerException("Error encoding password",e);
}
- DatabaseStatementUnplugged dbsu;
+
+
+ Connection connection = null;
try {
- dbsu = DatabaseStatementUnplugged.getInstance(cmReadonly);
- utente.login(dbsu.getConnection());
-
- Parameters parameters = Parameters.getInstance();
-
- if (!utente.hasPolicy(parameters.get("POL_SA","SA")) &&
- !utente.hasPolicy(parameters.get("POL_UP_DOWN","UP_DOWN"))) {
- // Utente con polici non valida
- log.error("Not valid policy for username '"+request.getUsername()+"'");
- throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID);
- }
-
+ connection = DatabaseManager.getInstance().getConnection();
+ utente.login(connection);
} 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);
+ } finally {
+ DatabaseManager.closeConnection(connection);
+ }
+
+ Parameters parameters = Parameters.getInstance();
+
+ if (!utente.hasPolicy(parameters.get("POL_SA","SA")) &&
+ !utente.hasPolicy(parameters.get("POL_UP_DOWN","UP_DOWN"))) {
+ // Utente con polici non valida
+ log.error("Not valid policy for username '"+request.getUsername()+"'");
+ throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID);
}
+
+
}
--
libgit2 0.21.4