From 9da5a81ff90764c1925d0c6c1cf00a20899f2a2a Mon Sep 17 00:00:00 2001
From: m.veroni <m.veroni@edf0334f-4afc-450a-8f92-fe1409970e7d>
Date: Wed, 25 Jun 2014 14:47:43 +0000
Subject: [PATCH] Versione 1.0.0, fix e rilascio in dev

---
 WebContent/form/upload.jsp                                                         |  54 ++++++++++++++++++++++++++++--------------------------
 builder.xml                                                                        |   5 +++--
 conf/ADT/test-liliana/META-INF/context.xml                                         |  42 ++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/test-liliana/WEB-INF/web.xml                                              | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/test-liliana/conf/log4j.xml                                               | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/test-liliana/conf/portal_settings.xml                                     |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/test-liliana/version.xml                                                  |  12 ++++++++++++
 conf/liliana/develop/META-INF/context.xml                                          |  62 --------------------------------------------------------------
 conf/liliana/develop/WEB-INF/web.xml                                               | 471 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 conf/liliana/develop/conf/log4j.xml                                                | 147 ---------------------------------------------------------------------------------------------------------------------------------------------------
 conf/liliana/develop/conf/portal_settings.xml                                      | 106 ----------------------------------------------------------------------------------------------------------
 conf/liliana/develop/conf/sso.xml                                                  |  35 -----------------------------------
 conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png                    | Bin 6371 -> 0 bytes
 conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png           | Bin 17006 -> 0 bytes
 conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png                  | Bin 4384 -> 0 bytes
 conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png         | Bin 12415 -> 0 bytes
 conf/liliana/develop/image-pack/background-image.png                               | Bin 50042 -> 0 bytes
 conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png              | Bin 7287 -> 0 bytes
 conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png     | Bin 13263 -> 0 bytes
 conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png            | Bin 6175 -> 0 bytes
 conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png   | Bin 10457 -> 0 bytes
 conf/liliana/develop/version.xml                                                   |  12 ------------
 conf/liliana/staging/META-INF/context.xml                                          |  62 --------------------------------------------------------------
 conf/liliana/staging/WEB-INF/web.xml                                               | 471 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 conf/liliana/staging/conf/log4j.xml                                                | 147 ---------------------------------------------------------------------------------------------------------------------------------------------------
 conf/liliana/staging/conf/portal_settings.xml                                      | 104 --------------------------------------------------------------------------------------------------------
 conf/liliana/staging/conf/sso.xml                                                  |  31 -------------------------------
 conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png                    | Bin 8775 -> 0 bytes
 conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png           | Bin 25023 -> 0 bytes
 conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png                  | Bin 6134 -> 0 bytes
 conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png         | Bin 17327 -> 0 bytes
 conf/liliana/staging/image-pack/background-image.png                               | Bin 42730 -> 0 bytes
 conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png              | Bin 7306 -> 0 bytes
 conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png     | Bin 13303 -> 0 bytes
 conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png            | Bin 6168 -> 0 bytes
 conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png   | Bin 10457 -> 0 bytes
 conf/liliana/staging/version.xml                                                   |  12 ------------
 conf/version.properties                                                            |   8 ++++----
 packaging.xml                                                                      | 116 ++++++++------------------------------------------------------------------------------------------------------------
 src/conf/portal_settings.xml                                                       |  14 ++++++++++++++
 src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java          |   8 +++++++-
 src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java |  28 ++++++++++------------------
 src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java             |  27 ---------------------------
 src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java         |  76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java |   7 +++++--
 src/it/softecspa/fileproxy/services/common/ResponseOutcome.java                    |   4 ++++
 src/it/softecspa/fileproxy/services/common/core/UniversalSession.java              |   2 +-
 src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java |   2 +-
 48 files changed, 531 insertions(+), 1850 deletions(-)
 create mode 100644 conf/ADT/test-liliana/META-INF/context.xml
 create mode 100644 conf/ADT/test-liliana/WEB-INF/web.xml
 create mode 100644 conf/ADT/test-liliana/conf/log4j.xml
 create mode 100644 conf/ADT/test-liliana/conf/portal_settings.xml
 create mode 100644 conf/ADT/test-liliana/version.xml
 delete mode 100644 conf/liliana/develop/META-INF/context.xml
 delete mode 100644 conf/liliana/develop/WEB-INF/web.xml
 delete mode 100644 conf/liliana/develop/conf/log4j.xml
 delete mode 100644 conf/liliana/develop/conf/portal_settings.xml
 delete mode 100644 conf/liliana/develop/conf/sso.xml
 delete mode 100644 conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png
 delete mode 100644 conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png
 delete mode 100644 conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png
 delete mode 100644 conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png
 delete mode 100644 conf/liliana/develop/image-pack/background-image.png
 delete mode 100644 conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png
 delete mode 100644 conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png
 delete mode 100644 conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png
 delete mode 100644 conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png
 delete mode 100644 conf/liliana/develop/version.xml
 delete mode 100644 conf/liliana/staging/META-INF/context.xml
 delete mode 100644 conf/liliana/staging/WEB-INF/web.xml
 delete mode 100644 conf/liliana/staging/conf/log4j.xml
 delete mode 100644 conf/liliana/staging/conf/portal_settings.xml
 delete mode 100644 conf/liliana/staging/conf/sso.xml
 delete mode 100644 conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png
 delete mode 100644 conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png
 delete mode 100644 conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png
 delete mode 100644 conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png
 delete mode 100644 conf/liliana/staging/image-pack/background-image.png
 delete mode 100644 conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png
 delete mode 100644 conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png
 delete mode 100644 conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png
 delete mode 100644 conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png
 delete mode 100644 conf/liliana/staging/version.xml
 delete mode 100644 src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java
 create mode 100644 src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java

diff --git a/WebContent/form/upload.jsp b/WebContent/form/upload.jsp
index ab1fe3c..ee28d3e 100644
--- a/WebContent/form/upload.jsp
+++ b/WebContent/form/upload.jsp
@@ -8,7 +8,7 @@
 %>
 <html>
 <head>
-	<title>Upload file</title>
+	<title>Upload file - test page</title>
 	<meta http-equiv="expires" content="-1">
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
@@ -45,6 +45,21 @@
 		}
 	</script>
 	<style>
+		HTML,BODY {
+			margin-top: 5px;
+			margin-left: 5px;
+			margin-right: 5px;
+			margin-bottom: 5px;
+			/* http://www.google.com/fonts */
+			font-family: 'Source Sans Pro', Frutiger, Arial, Helvetica, sans-serif; 
+			/* font-family: Frutiger, Arial, Helvetica, sans-serif; */
+			font-size: 14px;
+			font-weight: 400;
+			background-color: white;
+			color: black;
+			height: 100%
+		}
+		
 		.tabella {border:solid 1px #DDDDEE; color:#2b2b2b; }
 		.cella {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px;}
 		.cellaIntestazione {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px; font-weight:bold;}
@@ -52,66 +67,53 @@
 </head>
 <body>
 	<form name="dati">
-		<table border="0" cellspacing="2" cellpadding="2" class="tabella">
-			<tr><td colspan="2" class="cellaIntestazione">Simulazione traferimento file</td></tr>
+		<table border="0" cellspacing="1" cellpadding="1" class="tabella">
 			<tr>
-				<td colspan="2" class="cella">
-					<ul>
-					<li>Incollare XML nella text area</li>
-					<li>La login e la password devono essere quelle di un utente abilitato all'import dei dati (ad esempio un amministratore) </li>
-					<li>Alla fine dell'importazione verrà visualizzato nell'area esito il risultato dell'importazione:</li>
-					</ul>
-				</td>
+				<td class="cella" width="120px"><b>login</b></td>
+				<td class="cella" ><input name="FIELD_USERNAME" type="text"></td>
 			</tr>
 			<tr>
-				<td class="cella">login</td>
-				<td class="cella"><input name="FIELD_USERNAME" type="text"></td>
-			</tr>
-			<tr>
-				<td class="cella">password</td>
+				<td class="cella"><b>password</b></td>
 				<td class="cella"><input name="FIELD_PASSWORD" type="password"></td>
 			</tr>
 			
 			<tr>
-				<td class="cella">path</td>
+				<td class="cella"><b>path</b></td>
 				<td class="cella"><input name="FIELD_PATH" type="text"></td>
 			</tr>
 			<tr>
-				<td class="cella">fileName</td>
+				<td class="cella"><b>fileName</b></td>
 				<td class="cella"><input name="FIELD_FILENAME" type="text"></td>
 			</tr>
 			<tr>
-				<td class="cella">overwrite</td>
+				<td class="cella"><b>overwrite</b></td>
 				<td class="cella"><input name="FIELD_OVERWRITE" type="checkbox" value="true"></td>
 			</tr>
 			<tr>
-				<td class="cella">append</td>
+				<td class="cella"><b>append</b></td>
 				<td class="cella"><input name="FIELD_APPEND" type="checkbox" value="true"></td>
 			</tr>
 			<tr>
-				<td class="cella">bufferLength</td>
+				<td class="cella"><b>bufferLength</b></td>
 				<td class="cella"><input name="FIELD_BUFFER" type="text"></td>
 			</tr>
 			
 			<tr>
-				<td class="cella" colspan="2"><input type="button" value="Invia dati" onclick="sendData();"></td>
+				<td class="cella" colspan="2"><input type="button" value="Upload" onclick="sendData();"></td>
 			</tr>
 			<tr>
 				<td colspan="2" class="cella">
 					<div style="display: inline-block; vertical-align: top;">		
-						<div style="display: inline-block; vertical-align: top;">	
-							Invio<br>
+						<div style="display: inline-block; vertical-align: top;">&nbsp;<b>Input</b><br>
 							<textarea name="FIELD_REQUEST" cols="80" rows="40"></textarea>
 						</div>
-						<div style="display:inline-block; vertical-align: top;">	
-							Esito<br>
+						<div style="display:inline-block; vertical-align: top;">&nbsp;<b>Response</b><br>
 							<textarea name="FIELD_RESPONSE" readonly="readonly" cols="50" rows="20"></textarea>
 						</div>
 					</div>
 				</td>
 			</tr>
 		</table>
-		
 	</form>
 </body>
 </html>
diff --git a/builder.xml b/builder.xml
index 16c8592..f524a57 100644
--- a/builder.xml
+++ b/builder.xml
@@ -35,7 +35,7 @@
 		<property name="project.conf" value="conf" />
 
 		<!-- Nome del progetto a cui sono legati i file di configurazione - FIXME -->
-		<property name="application.name" value="appbike" />
+		<property name="application.name" value="fproxy" />
 
 		<!-- Nome base del file war a cui saranno concatenati versione e release -->
 		<property name="project.warfile" value="${application.name}" />
@@ -244,7 +244,7 @@
 
 			<fileset dir="${project.conf}/${installation}/">
 				<include name="META-INF/context.xml"/>
-				<include name="image-pack/**"/>
+				<!-- <include name="image-pack/**"/> -->
 				<!-- <include name="config.local/version.txt"/> -->
 			</fileset>
 
@@ -253,6 +253,7 @@
 			<lib dir="${project.lib}/common" >
 				<exclude name="indexer/**"/>
 				<exclude name="analyzer**"/>
+				<exclude name="local/**"/>
 			</lib>
 			<!-- COMMON - LOCAL -->
 			<lib dir="${project.lib}/common/local" >
diff --git a/conf/ADT/test-liliana/META-INF/context.xml b/conf/ADT/test-liliana/META-INF/context.xml
new file mode 100644
index 0000000..2dfa4d9
--- /dev/null
+++ b/conf/ADT/test-liliana/META-INF/context.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context antiJARLocking="true"
+		  antiResourceLocking="false"
+		  distributable="true" 
+		  reloadable="false" crossContext="false">
+	
+		  
+	<!-- Default set of monitored resources -->
+  	<WatchedResource>WEB-INF/web.xml</WatchedResource>
+	
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ 	<Manager pathname="" />	  
+
+
+	<!--  SVILUPPO - ADT -->
+	<Resource   name="jdbc/mwm_app"
+				auth="Container" 
+	  			description="DB Connection" 
+	  			driverClass="com.mysql.jdbc.Driver" 
+	  			
+				initialPoolSize="2"
+				minPoolSize="2" 
+				maxPoolSize="10" 
+				acquireIncrement="2" 
+				
+				checkoutTimeout="3600"
+				breakAfterAcquireFailure="false"
+				maxIdleTimeExcessConnections = "30"
+				maxIdleTime = "1800"
+				maxConnectionAge="3600"				
+				idleConnectionTestPeriod="200"
+				
+	  			user="web144u2" 
+				password="fdte5532" 
+  				factory="org.apache.naming.factory.BeanFactory" 
+  				type="com.mchange.v2.c3p0.ComboPooledDataSource" 
+  				jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web144db2?autoReconnect=true&amp;characterEncoding=UTF-8" /> 
+	  			    
+</Context>
+
+
+
diff --git a/conf/ADT/test-liliana/WEB-INF/web.xml b/conf/ADT/test-liliana/WEB-INF/web.xml
new file mode 100644
index 0000000..aa29a1c
--- /dev/null
+++ b/conf/ADT/test-liliana/WEB-INF/web.xml
@@ -0,0 +1,133 @@
+<?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 (6) - ADT/test-liliana [25/06/2014 14:56]</display-name>
+	<!-- Ultime modifiche del 23/06/2014 -->
+	
+	<!-- Configurazione per New Relic -->
+	<context-param>
+		  <param-name>com.newrelic.agent.APPLICATION_NAME</param-name>
+		  <param-value>FileProxyServer ADT (test)</param-value>
+	</context-param>	
+	
+	<!-- ADT/test-liliana - 25/06/2014 14:56 -->
+	<!-- Configurazioni obbligatorie -->
+	<context-param>
+		<param-name>ErrorPage</param-name>
+		<param-value>/error.jsp</param-value>
+	</context-param>
+	<context-param>
+		<param-name>constantsFile</param-name>
+		<param-value>portal_settings.xml</param-value>
+	</context-param>
+	<context-param>
+		<param-name>logPropertyFile</param-name>
+		<param-value>log4j.xml</param-value>
+	</context-param>
+	
+	<context-param>
+		<param-name>defaultLanguage</param-name>
+		<param-value>it</param-value>
+	</context-param>
+	
+	<!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio -->
+	<context-param>
+		<param-name>SessionFactory</param-name>
+		<param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value>
+	</context-param>
+	
+	<!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio -->
+	<context-param>
+		<param-name>SecurityManager</param-name>
+		<param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value>
+	</context-param>
+	
+	<!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi	-->
+	<context-param>
+		<param-name>accessLogWhat</param-name>
+		<param-value>,*,</param-value>
+	</context-param>
+	
+	<!-- @deprecated - Configurazioni opzionali -->
+	<context-param>
+		<param-name>mailServer</param-name>
+		<param-value>localhost</param-value>
+	</context-param>
+	
+	<!-- Da valorizzare se si vuole la autenticazione JWebber -->
+	<context-param>
+		<param-name>keyStore</param-name>
+		<param-value>it.softecspa.portal.security.KeyStoreImpl</param-value>
+	</context-param>
+	
+	<!-- Servlet -->
+	
+	<!-- Startup -->
+	<servlet>
+		<servlet-name>WebApp</servlet-name>
+		<servlet-class>it.softecspa.portal.InitWebApp</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>WebApp</servlet-name>
+		<url-pattern>/WebApp</url-pattern>
+	</servlet-mapping>
+	
+	
+	<!-- POST-SERVICE - servlet -->
+	<servlet>
+		<description>Servlet http file proxy</description>	
+		<display-name>httpFileProxy-Statement Servlet</display-name>
+		<servlet-name>httpFileProxyServlet</servlet-name>
+		<servlet-class>it.softecspa.fileproxy.proxyservices.HttpFileProxyService</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>httpFileProxyServlet</servlet-name>
+		<url-pattern>/proxy-services/statement</url-pattern>
+	</servlet-mapping>
+	
+	
+			
+	<!-- MONITOR - servlet -->
+	<servlet>
+		<description>Servlet di monitoraggio standard</description>				
+		<display-name>Monitor Servlet</display-name>
+		<servlet-name>Monitor</servlet-name>
+		<servlet-class>it.softecspa.portal.Monitor</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Monitor</servlet-name>
+		<url-pattern>/monitor</url-pattern>
+	</servlet-mapping>
+	
+	
+
+	<session-config>
+		<!-- Sono Minuti -->
+		<session-timeout>15</session-timeout>
+	</session-config>
+
+	<mime-mapping>
+		<extension>html</extension>
+		<mime-type>text/html</mime-type>
+	</mime-mapping>
+	
+	<mime-mapping>
+		<extension>dtd</extension>
+		<mime-type>text/plain</mime-type>
+	</mime-mapping>
+	
+	
+	
+	
+	
+	
+	
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>default.html</welcome-file>
+		<welcome-file>default.htm</welcome-file>
+		<welcome-file>default.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>
diff --git a/conf/ADT/test-liliana/conf/log4j.xml b/conf/ADT/test-liliana/conf/log4j.xml
new file mode 100644
index 0000000..9ff80ce
--- /dev/null
+++ b/conf/ADT/test-liliana/conf/log4j.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+	<!-- APPLICATION LOG -->
+	<appender name="rootFile" class="it.softecspa.kahuna.log.DatedFileAppender">
+		<param name="Directory" value="/var/www/web144/log/adt_test_proxy" />
+		<param name="Prefix" value="${hostname}_service." />
+		<param name="Suffix" value=".log" />
+		<param name="Autoflush" value="15" />				
+		<layout class="org.apache.log4j.PatternLayout">																							
+        	<!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->    
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
+		</layout> 	
+	</appender>
+
+    	
+	<!-- STATEMENTS STATISTICS LOG -->
+	<appender name="statementFile" class="it.softecspa.kahuna.log.DatedFileAppender">
+		<param name="Directory" value="/var/www/web144/log/adt_test_proxy/statement" />
+		<param name="Prefix" value="${hostname}_statement." />
+		<param name="Suffix" value=".log" />
+		<param name="Autoflush" value="15" />				
+		<layout class="org.apache.log4j.PatternLayout">																							
+        	<param name="ConversionPattern" value="%m%n" />         
+		</layout> 	
+	</appender>
+
+	<!-- LOGGER SPECIFICI 
+	<category name="access" additivity="false">
+    	<priority value="INFO" />    	
+    	<appender-ref ref="accessFile" />        
+	</category> -->
+	
+	<category name="application" additivity="false">
+    	<priority value="INFO" />    	
+    	<appender-ref ref="rootFile" />        
+	</category>
+	
+	<category name="it.softecspa" additivity="false">
+    	<priority value="DEBUG" />    	
+    	<appender-ref ref="rootFile" />        
+	</category>
+	
+	<!-- Log di gestione della librera dbConnect -->
+	<category name="it.softecspa.database.dbconnect" additivity="false">
+    	<priority value="ERROR" />    	
+    	<appender-ref ref="rootFile" />        
+	</category>
+	
+	
+	<!-- Logger utilizzato per il monitoraggio delle query SQL
+	     Impostare a TRACE per visualizzare le query -->
+	<category name="it.softecspa.database.dbconnect.SQL" additivity="false">
+    	<priority value="TRACE" />	
+    	<appender-ref ref="rootFile" />        
+	</category>
+	
+	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
+	     Impostare a INFO per tracciare le statistiche -->
+	<category name="it.softecspa.database.c3p0.stats" additivity="false">
+    	<priority value="OFF" />
+    	<appender-ref ref="c3p0StatsFile" />
+	</category>
+	
+	<!-- Logger utilizzato per il monitoraggio delle chiamate
+	     Impostare a INFO per tracciare le chiamate -->	
+	<category name="it.softecspa.desktopmate.STATEMENT" additivity="false">
+		<priority value="INFO" />
+    	<appender-ref ref="statementFile" />
+	</category>
+	
+	<!-- Log da utilizzare nelle JSP -->
+	<category name="it.softecspa.JSP" additivity="false">
+    	<priority value="DEBUG" />    	
+    	<appender-ref ref="rootFile" />        
+	</category>
+	
+	<!-- Log per il servizio di posta
+	<category name="kahuna.mail" additivity="false">
+    	<priority value="DEBUG" />    	  
+    	<appender-ref ref="rootFile" />    	
+	</category>	-->
+	
+	<!-- Log specifico del componente c3p0 per la gestione del connection pool  -->
+ 	<category name="com.mchange" additivity="false">
+    	<priority value="INFO" />    	
+    	<appender-ref ref="rootFile" />  
+	</category>	
+	
+	<!-- Monitoraggio del reload del contesto.
+		 Utilizzato principalmente per monitore i riavvii dei nodi -->
+   	<category name="reload" additivity="false">
+    	<priority value="ERROR" />
+    	<appender-ref ref="reloadFile" />
+	</category>
+	
+	<!-- ROOT -->
+	<root>
+		<priority value="ERROR"/> 
+        <appender-ref ref="rootFile"/>
+	</root>
+</log4j:configuration>
diff --git a/conf/ADT/test-liliana/conf/portal_settings.xml b/conf/ADT/test-liliana/conf/portal_settings.xml
new file mode 100644
index 0000000..97c2640
--- /dev/null
+++ b/conf/ADT/test-liliana/conf/portal_settings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+	<comment>Applicazione Http File Proxy 1.0 - sviluppo</comment>
+
+	<!-- Mappatura DataSource, JWebber -->
+	<entry key="datasource.cms">jdbc/mwm_app#MYSQL</entry> 
+	<!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> -->
+	
+	<!-- Mappatura DataSource, applicazione 
+	     in caso di più datasource separare la lista con la "virgola" -->
+	<entry key="datasource.application">jdbc/mwm_app#MYSQL</entry> 
+	<!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry>  -->
+	
+	
+	
+	<!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat 
+		 Utilizzare la variabile ${hostname} -->
+	<entry key="cluster.mask">web144.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> 
+	<entry key="cluster.backplane.mask">web144.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> 	
+	
+	<entry key="application.domain">mwm.dev.ctsapplications.it</entry>
+	<!-- Application context name, leave it blank if there isn't a context -->
+	<entry key="application.context.name">adt_fileproxy</entry>
+	
+	<entry key="application.http.port"></entry>   		<!-- leave it blank for default port 80 -->
+	<entry key="application.https.port"></entry>		<!-- leave it blank for default port 443 -->
+	
+	<entry key="application.title">Http file proxy (ADT)</entry>
+	
+	<!-- NOTA: prefisso file di configurazione lingua e path immagini -->
+	<entry key="application.name">httpfileproxy</entry>
+	<entry key="application.environment">sviluppo</entry>
+	
+	<entry key="language.default">en</entry>	
+	<entry key="base.url">http://mwm.dev.ctsapplications.it/adt_fileproxy</entry>
+	
+	<!-- Abilitazione del task, default true  -->
+  	<entry key="timertask.enable">false</entry>
+	
+	<!-- Server di posta e webmaster -->
+  	<entry key="mail.enable">true</entry>
+	
+	<entry key="mail.smtp.host">smtp-out.softecspa.it</entry>
+	<entry key="mail.smtp.localhost"></entry>
+	<entry key="mail.smtp.user"></entry>
+ 	<entry key="mail.smtp.password"></entry>
+  	
+  	<entry key="mail.from">noreply@desktopmate.net</entry>
+  	<entry key="mail.to">dm-admins@softecspa.it</entry>
+  	<entry key="mail.cc"></entry>
+  	<entry key="mail.bcc"></entry>
+  	<entry key="mail.subject">File Proxy - ADT - liliana -</entry>
+
+	<!-- Se 'true' invia una mail al riavvio del sistema 
+	     Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione -->
+	<entry key="mail.start.enable">false</entry>
+	
+	<!-- Invia una mail al verificarsi di un errore non gestito, default 'false' -->
+	<entry key="mail.error.enable">true</entry>
+	
+	<!-- Invia una mail al verificarsi di un errore SQL, default 'false' -->
+	<entry key="mail.sqlerror.enable">true</entry>
+		
+		
+	<!-- Valori che servono per criptare la password 
+	     Questo modulo è legato al databse della workflow -->
+	<entry key="chiaveCifraturaSimmetrica"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> 
+	<entry key="chiaveCifraturaPassword"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> 
+	<entry key="salt">&amp;s@(dfghdgféè*a+$2lnd</entry>
+	<entry key="Base64">true</entry>
+	<entry key="DoubleMd5"></entry>	
+	
+	
+	<entry key="POL_SA">SA</entry>
+	<entry key="POL_ADMIN">ADMIN</entry>
+	<entry key="POL_UP_DOWN">UP_DOWN</entry>
+		
+</properties>	 
\ No newline at end of file
diff --git a/conf/ADT/test-liliana/version.xml b/conf/ADT/test-liliana/version.xml
new file mode 100644
index 0000000..5bb83c7
--- /dev/null
+++ b/conf/ADT/test-liliana/version.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+	<comment>Version information</comment>
+
+	<entry key="version.number">1.0.0</entry> 				
+	<entry key="version.release"></entry>
+	<entry key="build.number">6</entry> 			
+	<entry key="build.date">25/06/2014 14:56</entry>
+	<entry key="build.installation">ADT/test-liliana</entry>
+	
+</properties>
diff --git a/conf/liliana/develop/META-INF/context.xml b/conf/liliana/develop/META-INF/context.xml
deleted file mode 100644
index 30f538a..0000000
--- a/conf/liliana/develop/META-INF/context.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Context  antiJARLocking="true"
-		  antiResourceLocking="false"
-		  distributable="true" 
-		  reloadable="false" crossContext="false">
-		  
-	<!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-	
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <Manager pathname="" />	  
-		 		  
-	<!-- SVILUPPO -->
-	<!-- DATASOURCE 	  -->
-	<Resource   name="jdbc/dm-stage"
-				auth="Container" 
-	  			description="DB Connection" 
-	  			driverClass="com.mysql.jdbc.Driver" 
-	  			
-				initialPoolSize="1"
-				minPoolSize="1" 
-				maxPoolSize="10" 
-				acquireIncrement="1" 
-				
-				checkoutTimeout="3600"
-				breakAfterAcquireFailure="false"
-				maxIdleTimeExcessConnections = "30"
-				maxIdleTime = "1800"
-				maxConnectionAge="3600"				
-				idleConnectionTestPeriod="200"
-				
-	  			user="web103u1" 
-				password="98c7EwXJS7" 
-	  			factory="org.apache.naming.factory.BeanFactory" 
-	  			type="com.mchange.v2.c3p0.ComboPooledDataSource" 
-	  			jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web103db1?autoReconnect=true&amp;characterEncoding=UTF-8" /> 
-    
-	<Resource   name="jdbc/dm-master"
-				auth="Container" 
-	  			description="DB Connection" 
-	  			driverClass="com.mysql.jdbc.Driver" 
-	  			
-				initialPoolSize="1"
-				minPoolSize="0" 
-				maxPoolSize="10" 
-				acquireIncrement="1" 
-				
-				checkoutTimeout="3600"
-				breakAfterAcquireFailure="false"
-				maxIdleTimeExcessConnections = "30"
-				maxIdleTime = "1800"
-				maxConnectionAge="3600"				
-				idleConnectionTestPeriod="200"
-				
-	  			user="web103u2" 
-				password="GOoRoTj5K5" 
-	  			factory="org.apache.naming.factory.BeanFactory" 
-	  			type="com.mchange.v2.c3p0.ComboPooledDataSource" 
-	  			jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web103db2?autoReconnect=true&amp;characterEncoding=UTF-8" /> 	 		  	      
-   
-    			     
-</Context>
\ No newline at end of file
diff --git a/conf/liliana/develop/WEB-INF/web.xml b/conf/liliana/develop/WEB-INF/web.xml
deleted file mode 100644
index 5e74ddd..0000000
--- a/conf/liliana/develop/WEB-INF/web.xml
+++ /dev/null
@@ -1,471 +0,0 @@
-<?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>DesktopMate + Jarvis console 2.10.16 (1814) - liliana/develop [05/06/2014 11:39]</display-name>
-	<!-- Ultime modifiche del 18/02/2014 -->
-	
-	<!-- liliana/develop - 05/06/2014 11:39 -->
-	<!-- Configurazioni obbligatorie -->
-	<context-param>
-		<param-name>ErrorPage</param-name>
-		<param-value>/error.jsp</param-value>
-	</context-param>
-	<context-param>
-		<param-name>constantsFile</param-name>
-		<param-value>portal_settings.xml</param-value>
-	</context-param>
-	<context-param>
-		<param-name>logPropertyFile</param-name>
-		<param-value>log4j.xml</param-value>
-	</context-param>
-	
-	<context-param>
-		<param-name>defaultLanguage</param-name>
-		<param-value>it</param-value>
-	</context-param>
-	
-	<!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio -->
-	<context-param>
-		<param-name>SessionFactory</param-name>
-		<param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value>
-	</context-param>
-	
-	<!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio -->
-	<context-param>
-		<param-name>SecurityManager</param-name>
-		<param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value>
-	</context-param>
-	
-	<!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi	-->
-	<context-param>
-		<param-name>accessLogWhat</param-name>
-		<param-value>,*,</param-value>
-	</context-param>
-	
-	<!-- @deprecated - Configurazioni opzionali -->
-	<context-param>
-		<param-name>mailServer</param-name>
-		<param-value>moon.softecspa.it</param-value>
-	</context-param>
-	
-	<!-- Da valorizzare se si vuole la autenticazione JWebber -->
-	<context-param>
-		<param-name>keyStore</param-name>
-		<param-value>it.softecspa.portal.security.KeyStoreImpl</param-value>
-	</context-param>
-	
-	
-	<!-- Daily report -->
-	<filter>
-	    <filter-name>urlRewrite-DayReportFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.DayReportFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-DayReportFilter</filter-name>
-	    <url-pattern>/dailyreport/*</url-pattern>
-	</filter-mapping>
-
-	
-	<!-- DM Store -->
-	<filter>
-	    <filter-name>urlRewrite-StoreFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.StoreFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-StoreFilter</filter-name>
-	    <url-pattern>/store/*</url-pattern>
-	</filter-mapping>
-	
-	
-	<!-- DM Share -->
-	<filter>
-	    <filter-name>urlRewrite-ShareFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.ShareFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-ShareFilter</filter-name>
-	    <url-pattern>/share/*</url-pattern>
-	</filter-mapping>
-	
-	
-	
-	
-	<!-- Servlet -->
-	
-	
-	<!-- J.A.R.V.I.S - mark 2 -->
-	<servlet>
-		<servlet-name>Mark2</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>mark-II</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.Mark2PR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>Mark2</servlet-name>
-		<url-pattern>/jarvis</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- J.A.R.V.I.S  mark 1 -->
-	<servlet>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>backdoor-panel</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<url-pattern>/backdoor-panel</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<url-pattern>/jarvis1</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Service Status -->
-	<servlet>
-		<servlet-name>ServicesStatus</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-status</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<!-- Clone della servlet BackdoorPanel che necessita di SSO -->
-	<servlet-mapping>
-		<servlet-name>ServicesStatus</servlet-name>
-		<url-pattern>/services-status</url-pattern>
-	</servlet-mapping>
-		
-	
-	
-	<!-- Master Status -->
-	<servlet>
-		<servlet-name>MasterSlave</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>master-slave</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.MasterSlavePR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>MasterSlave</servlet-name>
-		<url-pattern>/master-slave</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Service Synchro -->
-	<servlet>
-		<servlet-name>ServicesSynchro</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-synchro</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.ServicesSynchroPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ServicesSynchro</servlet-name>
-		<url-pattern>/services-synchro</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- @deprecated - Service Images -->
-	<servlet>
-		<servlet-name>ServicesImages</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-images</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.ServicesImagesPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ServicesImages</servlet-name>
-		<url-pattern>/services-images</url-pattern>
-	</servlet-mapping>	
-		
-		
-	<!-- Startup -->
-	<servlet>
-		<servlet-name>WebApp</servlet-name>
-		<servlet-class>it.softecspa.portal.InitWebApp</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>WebApp</servlet-name>
-		<url-pattern>/WebApp</url-pattern>
-	</servlet-mapping>
-	
-	
-	
-	<!-- DOWNLOAD-SERVICE - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione dei downloade dello store</description>	
-		<display-name>Store Service Servlet</display-name>
-		<servlet-name>StoreServiceServlet</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>store</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.StorePR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-		<!-- 
-		<servlet-class>it.softecspa.desktopmate.services.store.StoreServlet</servlet-class>
-		 -->
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>StoreServiceServlet</servlet-name>
-		<url-pattern>/store</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- POST-SERVICE - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la comunicazione tra server e device</description>	
-		<display-name>Device-Statement Servlet</display-name>
-		<servlet-name>DeviceStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.deviceservices.DeviceStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>DeviceStatementServlet</servlet-name>
-		<url-pattern>/services-post/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- NOTIFY REMOTE RENEWAL - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la notifica dei pagamenti eseguiti in remoto</description>		
-		<display-name>Renewal Notification Servlet</display-name>
-		<servlet-name>NotifyRemoteRenewal</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.otherservices.NotifyRemoteRenewal</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>NotifyRemoteRenewal</servlet-name>
-		<url-pattern>/notify</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi push - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione remota dei serivzi push</description>		
-		<display-name>Push-Statement Servlet</display-name>
-		<servlet-name>PushStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.pushservices.PushStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PushStatementServlet</servlet-name>
-		<url-pattern>/services-push/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi autorizzativi e di profilo - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione dei servizi amministrativi</description>		
-		<display-name>Auth-Statement Servlet</display-name>
-		<servlet-name>AuthStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.authservices.AuthStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AuthStatementServlet</servlet-name>
-		<url-pattern>/authentication-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di esportazione - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la esportazione dei dati</description>		
-		<display-name>Exporter-Statement Servlet</display-name>
-		<servlet-name>ExporterStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.connectors.ExporterStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ExporterStatementServlet</servlet-name>
-		<url-pattern>/connector-export/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di portale con autenticazione - servlet -->
-	<servlet>
-		<description>Servlet di portale servizi con autenticazione</description>		
-		<display-name>Portal-Statement (authenticated) Servlet</display-name>
-		<servlet-name>AuthPortalStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.portalservices.auth.AuthenticatedStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AuthPortalStatementServlet</servlet-name>
-		<url-pattern>/portal-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di portale con guest - servlet -->
-	<servlet>
-		<description>Servlet di portale servizi</description>		
-		<display-name>Portal-Statement (guest) Servlet</display-name>
-		<servlet-name>GuestPortalStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.portalservices.guest.GuestStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GuestPortalStatementServlet</servlet-name>
-		<url-pattern>/portal-service-guest/statement</url-pattern>
-	</servlet-mapping>
-			
-			
-	<!-- Gestione servizi di interconnesione a MyDesktopmate - servlet -->
-	<servlet>
-		<description>Servlet collegamento con MyDesktopmate</description>		
-		<display-name>MyDesktopmate-Statement Servlet</display-name>
-		<servlet-name>MyDesktopmateStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.my.services.ConnectorStatement</servlet-class>
-	</servlet>		
-	<servlet-mapping>
-		<servlet-name>MyDesktopmateStatementServlet</servlet-name>
-		<url-pattern>/mydesktopmate-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi geoip - servlet 
-	<servlet>
-		<description>Servlet servizi geoip</description>		
-		<display-name>GeoIP-Statement Servlet</display-name>
-		<servlet-name>GeoipServiceServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.geoip.GeoIP</servlet-class>
-	</servlet>			
-	<servlet-mapping>
-		<servlet-name>GeoipServiceServlet</servlet-name>
-		<url-pattern>/geoip/service</url-pattern>
-	</servlet-mapping>	
-	-->		
-			
-	<!-- MONITOR - servlet -->
-	<servlet>
-		<description>Servlet di monitoraggio standard</description>				
-		<display-name>Monitor Servlet</display-name>
-		<servlet-name>Monitor</servlet-name>
-		<servlet-class>it.softecspa.portal.Monitor</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>Monitor</servlet-name>
-		<url-pattern>/monitor</url-pattern>
-	</servlet-mapping>
-	
-	
-
-	<session-config>
-		<!-- Sono Minuti -->
-		<session-timeout>30</session-timeout>
-	</session-config>
-
-	<mime-mapping>
-		<extension>html</extension>
-		<mime-type>text/html</mime-type>
-	</mime-mapping>
-	
-	<mime-mapping>
-		<extension>dtd</extension>
-		<mime-type>text/plain</mime-type>
-	</mime-mapping>
-	
-	
-	
-	
-	
-	
-	
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/conf/liliana/develop/conf/log4j.xml b/conf/liliana/develop/conf/log4j.xml
deleted file mode 100644
index 30d86dd..0000000
--- a/conf/liliana/develop/conf/log4j.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-
-	<!-- APPLICATION LOG -->
-	<appender name="rootFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web103/log/ROOT" />
-		<param name="Prefix" value="${hostname}_service." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">		
-			<!-- <param name="ConversionPattern" value="%X{sessionId} - %d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> --> 																					
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- RELOAD LOG -->
-	<appender name="reloadFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web103/log/ROOT/reload" />
-		<param name="Prefix" value="${hostname}_node." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="90" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- STATS LOG -->
-	<appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web103/log/ROOT/pool" />
-		<param name="Prefix" value="${hostname}_c3p0." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-	
-	<!-- DRAFT DATA STATS LOG -->
-	<appender name="draftDataFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web103/log/ROOT/draft" />
-		<param name="Prefix" value="${hostname}_draft." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- STATEMENTS STATISTICS LOG -->
-	<appender name="statementFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web103/log/ROOT/statement" />
-		<param name="Prefix" value="${hostname}_statement." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="30" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- LOGGER SPECIFICI 
-	<category name="access" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="accessFile" />        
-	</category> -->
-	
-	<category name="application" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<category name="it.softecspa" additivity="false">
-    	<priority value="DEBUG" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log dei gestione della librera GQFramework -->
-	<category name="it.softecspa.database.gqframework" additivity="false">
-    	<priority value="ERROR" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log di gestione della librera DM SSO -->
-	<category name="it.softecspa.DMSSO" additivity="false">
-    	<priority value="TRACE" />
-    	<appender-ref ref="rootFile" />    	
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio delle query SQL
-	     Impostare a TRACE per visualizzare le query -->
-	<category name="it.softecspa.database.dbconnect.SQL" additivity="false">
-    	<priority value="TRACE" />	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
-	     Impostare a INFO per tracciare le statistiche -->
-	<category name="it.softecspa.database.c3p0.stats" additivity="false">
-    	<priority value="OFF" />
-    	<appender-ref ref="c3p0StatsFile" />
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio delle chiamate
-	     Impostare a INFO per tracciare le chiamate -->	
-	<category name="it.softecspa.desktopmate.STATEMENT" additivity="false">
-		<priority value="INFO" />
-    	<appender-ref ref="statementFile" />
-	</category>
-	
-	<!-- Log da utilizzare nelle JSP -->
-	<category name="it.softecspa.JSP" additivity="false">
-    	<priority value="DEBUG" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log per il servizio di posta
-	<category name="kahuna.mail" additivity="false">
-    	<priority value="DEBUG" />    	  
-    	<appender-ref ref="rootFile" />    	
-	</category>	-->
-	
-	<!-- Log specifico del componente c3p0 per la gestione del connection pool  -->
- 	<category name="com.mchange" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="rootFile" />  
-	</category>	
-	
-	<!-- Monitoraggio del reload del contesto.
-		 Utilizzato principalmente per monitore i riavvii dei nodi -->
-   	<category name="reload" additivity="false">
-    	<priority value="INFO" />
-    	<appender-ref ref="reloadFile" />
-	</category>
-	
-	<!-- Monitoraggio delle interrogazioni draft -->
-   	<category name="draft.data" additivity="false">
-    	<priority value="INFO" />
-    	<appender-ref ref="draftDataFile" />
-	</category>
-	
-	<!-- ROOT -->
-	<root>
-		<priority value="ERROR"/> 
-        <appender-ref ref="rootFile"/>
-	</root>
-</log4j:configuration>
diff --git a/conf/liliana/develop/conf/portal_settings.xml b/conf/liliana/develop/conf/portal_settings.xml
deleted file mode 100644
index 6333e42..0000000
--- a/conf/liliana/develop/conf/portal_settings.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Applicazione DesktopaMate 2.0 - sviluppo</comment>
-
-	<!-- Mappatura DataSource, JWebber -->
-	<entry key="datasource.cms">jdbc/dm-stage#MYSQL</entry>
-	<!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> -->
-	 
-	<!-- Mappatura DataSource, applicazione 
-	     in caso di più datasource separare la lista con la "virgola" -->
-	<entry key="datasource.application">jdbc/dm-master#MYSQL,jdbc/dm-stage#MYSQL</entry>
-	<!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry> -->
-	 
-	<!-- NOTA
-		 Il primo database in lista deve essere obbligatoriamente quello MASTER
-		 Il secondo quello di STAGE. Sono obbligatori entrambi
-		 
-		 Nel caso sia specificato quello in sola lettura, valgono le stesse regole
-	 -->
-	
-	<!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat 
-	     Utilizzare la varibile ${hostname} -->
-	<entry key="cluster.mask">web103.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> 
-	<entry key="cluster.backplane.mask">web103.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> 
-	
-	<entry key="jarvis.header.color">#F0DF25</entry>
-	
-	<entry key="application.domain">service.dev.desktopmate.net</entry>
-	<!-- Application context name, leave it blank if there isn't a context 
-	<entry key="application.context.name"></entry> -->
-	
-	<!-- <entry key="application.http.port">80</entry>   		leave it blank for default port 80 -->
-	<!-- <entry key="application.https.port">8443</entry>		leave it blank for default port 443 -->
-	
-	<!-- Time after that the page will be redirect 
-	<entry key="TIME_REDIRECT_PAGE">4</entry> -->
-	
-	<entry key="application.title">DesktopMate</entry>
-	
-	<!-- NOTA: prefisso file di configurazione lingua e path immagini -->
-	<entry key="application.name">dmservice</entry>
-	<entry key="application.environment">sviluppo</entry>
-	
-	<entry key="language.default">en</entry>	
-	<entry key="base.url">http://service.dev.desktopmate.net</entry>
-	
-	<!-- Autocensus username -->
-	<entry key="autocensus.login">true</entry>
-	<entry key="autocensus.profile">DOWNLOADER</entry>
-	
-	<!-- Configurazione propria dell'applicazione -->	
-	<entry key="admin.policy.id">SA</entry>
-	
-	<!-- Formato della data in visualizzazione -->
-	<entry key="standard.datetime.format">dd/MM/yyyy HH:mm:ss</entry>
-	<entry key="standard.date.format">dd/MM/yyyy</entry>
-	
-	
-	<!-- Policies -->
-	<entry key="policy.SA">SA</entry>
-	<entry key="policy.ADMIN">ADMIN</entry>
-	
-	
-	<!-- Abilitazione del task, default true  -->
-  	<entry key="timertask.enable">false</entry>
-	
-	
-	<!-- Server di posta e webmaster -->
-  	<entry key="mail.enable">true</entry>
-	
-	<!-- <entry key="mail.smtp.host">smtp-out.softecspa.it</entry> provvisorio -->
-	<entry key="mail.smtp.host">localhost</entry>	
-	<entry key="mail.smtp.localhost"></entry>
-	<entry key="mail.smtp.user"></entry>
- 	<entry key="mail.smtp.password"></entry>
-  	
-  	<entry key="mail.from">dm-web103-service.liliana@desktopmate.net</entry>
-  	<entry key="mail.to">massimiliano.veroni@softecspa.it</entry>
-  	<entry key="mail.cc"></entry>
-  	<entry key="mail.bcc"></entry>
-  	<entry key="mail.subject">DesktopMate - web103 - liliana -</entry>
-
-	<!-- Se 'true' invia una mail al riavvio del sistema 
-	     Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione -->
-	<entry key="mail.start.enable">false</entry>
-	
-	<!-- Invia una mail al verificarsi di un errore non gestito, default 'false' -->
-	<entry key="mail.error.enable">true</entry>
-
-	<!-- Invia una mail al verificarsi di un errore SQL, default 'false' -->
-	<entry key="mail.sqlerror.enable">true</entry>
-	
-	<!-- Invia una mail quando arriva un nuovo modello di device, default 'false' -->
-	<entry key="mail.new-device-model.enable">true</entry>
-	
-	<!-- Abilitazione sistema di recupero messaggi push non inviati al reload del contesto, default 'false' -->
-	<entry key="push.recovery.enable">false</entry>	
-	
-	
-	<!-- Paginazione 
-	<entry key="line4page">6</entry>	
-	<entry key="max.segue">6</entry>
-	-->
-	
-</properties>	 
\ No newline at end of file
diff --git a/conf/liliana/develop/conf/sso.xml b/conf/liliana/develop/conf/sso.xml
deleted file mode 100644
index 5e67ac4..0000000
--- a/conf/liliana/develop/conf/sso.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Configurazione SSO DNA</comment>
-
- 	<entry key="cookie.enable">true</entry>
-	<!-- <entry key="cookie.domain">.dev.desktopmate.net</entry> -->
-
-	<!-- Identificativi del client sul server SSO -->
-	<entry key="client.id">dmservice</entry>
-	<entry key="client.secret">d1906cca-d858-4420-ba54-f8c0984883bd</entry>
-	<entry key="default.scope">userinfo</entry>
-	<entry key="default.organization">SOFTEC</entry>
-	
-	<entry key="oauth2.server">http://dmsso.dev.desktopmate.net/dmsso</entry>
-	<entry key="oauth2.server.signature">9c5a523d-e3b1-4611-968b-c0e9207394fa:a9eaecee-387e-43ff-84ae-e2d77d3e4d1b</entry>
-	
-	<!-- Endpoint del serve SSO -->
-	<entry key="authorization.endpoint">${oauth2.server}/oauth2/authorize</entry>
-	<entry key="token.endpoint">${oauth2.server}/oauth2/token</entry>
-	<entry key="token.info.endpoint">${oauth2.server}/v1/tokeninfo</entry>
-	<entry key="user.info.endpoint">${oauth2.server}/v1/userinfo</entry>
-	<entry key="change.password.endpoint">${oauth2.server}/admin</entry>
-	<entry key="logout.endpoint">${oauth2.server}/logout</entry>
-	
-	<!-- Url di ritorno del server locale 
-	<entry key="redirect.uri">http://service.dev.desktopmate.net/jarvis</entry>
-	<entry key="logout.uri">http://service.dev.desktopmate.net/jarvis?sso_status=LOGOUT</entry>
-	<entry key="error.uri">http://service.dev.desktopmate.net/jarvis?sso_status=ERROR</entry>
-	-->
-	<entry key="redirect.uri">${autourl}</entry>
-	<entry key="logout.uri">${autourl}?sso_status=LOGOUT</entry>
-	<entry key="error.uri">${autourl}?sso_status=ERROR</entry>
-			
-</properties>	 
\ No newline at end of file
diff --git a/conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png b/conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png
deleted file mode 100644
index fffc196..0000000
Binary files a/conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png b/conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png
deleted file mode 100644
index 39acd17..0000000
Binary files a/conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png b/conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png
deleted file mode 100644
index ab8c2a7..0000000
Binary files a/conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png b/conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png
deleted file mode 100644
index aeda664..0000000
Binary files a/conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/background-image.png b/conf/liliana/develop/image-pack/background-image.png
deleted file mode 100644
index 554ce10..0000000
Binary files a/conf/liliana/develop/image-pack/background-image.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png b/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png
deleted file mode 100644
index b909a23..0000000
Binary files a/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png b/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png
deleted file mode 100644
index 8c4cda3..0000000
Binary files a/conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png b/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png
deleted file mode 100644
index 2b9fb69..0000000
Binary files a/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png and /dev/null differ
diff --git a/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png b/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png
deleted file mode 100644
index c7f3113..0000000
Binary files a/conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png and /dev/null differ
diff --git a/conf/liliana/develop/version.xml b/conf/liliana/develop/version.xml
deleted file mode 100644
index 3deb8f9..0000000
--- a/conf/liliana/develop/version.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Version information</comment>
-
-	<entry key="version.number">2.10.16</entry> 				
-	<entry key="version.release"></entry>
-	<entry key="build.number">1814</entry> 			
-	<entry key="build.date">05/06/2014 11:39</entry>
-	<entry key="build.installation">liliana/develop</entry>
-	
-</properties>
diff --git a/conf/liliana/staging/META-INF/context.xml b/conf/liliana/staging/META-INF/context.xml
deleted file mode 100644
index 8268f17..0000000
--- a/conf/liliana/staging/META-INF/context.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Context  antiJARLocking="true"
-		  antiResourceLocking="false"
-		  distributable="true" 
-		  reloadable="false" crossContext="false">
-		  
-	<!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-	
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <Manager pathname="" />	  
-		 		  
-	<!-- SVILUPPO -->
-	<!-- DATASOURCE 	  -->
-	<Resource   name="jdbc/dm-stage"
-				auth="Container" 
-	  			description="DB Connection" 
-	  			driverClass="com.mysql.jdbc.Driver" 
-	  			
-				initialPoolSize="1"
-				minPoolSize="1" 
-				maxPoolSize="20" 
-				acquireIncrement="1" 
-				
-				checkoutTimeout="3600"
-				breakAfterAcquireFailure="false"
-				maxIdleTimeExcessConnections = "30"
-				maxIdleTime = "1800"
-				maxConnectionAge="3600"				
-				idleConnectionTestPeriod="200"
-				
-	  			user="web124u1" 
-				password="98c7EwXJS7" 
-	  			factory="org.apache.naming.factory.BeanFactory" 
-	  			type="com.mchange.v2.c3p0.ComboPooledDataSource" 
-	  			jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web124db1?autoReconnect=true&amp;characterEncoding=UTF-8" /> 
-    
-	<Resource   name="jdbc/dm-master"
-				auth="Container" 
-	  			description="DB Connection" 
-	  			driverClass="com.mysql.jdbc.Driver" 
-	  			
-				initialPoolSize="1"
-				minPoolSize="0" 
-				maxPoolSize="20" 
-				acquireIncrement="1" 
-				
-				checkoutTimeout="3600"
-				breakAfterAcquireFailure="false"
-				maxIdleTimeExcessConnections = "30"
-				maxIdleTime = "1800"
-				maxConnectionAge="3600"				
-				idleConnectionTestPeriod="200"
-				
-	  			user="web124u2" 
-				password="GOoRoTj5K5" 
-	  			factory="org.apache.naming.factory.BeanFactory" 
-	  			type="com.mchange.v2.c3p0.ComboPooledDataSource" 
-	  			jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web124db2?autoReconnect=true&amp;characterEncoding=UTF-8" /> 	 		  	      
-   
-    			     
-</Context>
\ No newline at end of file
diff --git a/conf/liliana/staging/WEB-INF/web.xml b/conf/liliana/staging/WEB-INF/web.xml
deleted file mode 100644
index 1168422..0000000
--- a/conf/liliana/staging/WEB-INF/web.xml
+++ /dev/null
@@ -1,471 +0,0 @@
-<?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>DesktopMate + Jarvis console 2.10.18 (1820) - liliana/staging [13/06/2014 12:30]</display-name>
-	<!-- Ultime modifiche del 18/02/2014 -->
-	
-	<!-- liliana/staging - 13/06/2014 12:30 -->
-	<!-- Configurazioni obbligatorie -->
-	<context-param>
-		<param-name>ErrorPage</param-name>
-		<param-value>/error.jsp</param-value>
-	</context-param>
-	<context-param>
-		<param-name>constantsFile</param-name>
-		<param-value>portal_settings.xml</param-value>
-	</context-param>
-	<context-param>
-		<param-name>logPropertyFile</param-name>
-		<param-value>log4j.xml</param-value>
-	</context-param>
-	
-	<context-param>
-		<param-name>defaultLanguage</param-name>
-		<param-value>it</param-value>
-	</context-param>
-	
-	<!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio -->
-	<context-param>
-		<param-name>SessionFactory</param-name>
-		<param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value>
-	</context-param>
-	
-	<!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio -->
-	<context-param>
-		<param-name>SecurityManager</param-name>
-		<param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value>
-	</context-param>
-	
-	<!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi	-->
-	<context-param>
-		<param-name>accessLogWhat</param-name>
-		<param-value>,*,</param-value>
-	</context-param>
-	
-	<!-- @deprecated - Configurazioni opzionali -->
-	<context-param>
-		<param-name>mailServer</param-name>
-		<param-value>moon.softecspa.it</param-value>
-	</context-param>
-	
-	<!-- Da valorizzare se si vuole la autenticazione JWebber -->
-	<context-param>
-		<param-name>keyStore</param-name>
-		<param-value>it.softecspa.portal.security.KeyStoreImpl</param-value>
-	</context-param>
-	
-	
-	<!-- Daily report -->
-	<filter>
-	    <filter-name>urlRewrite-DayReportFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.DayReportFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-DayReportFilter</filter-name>
-	    <url-pattern>/dailyreport/*</url-pattern>
-	</filter-mapping>
-
-	
-	<!-- DM Store -->
-	<filter>
-	    <filter-name>urlRewrite-StoreFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.StoreFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-StoreFilter</filter-name>
-	    <url-pattern>/store/*</url-pattern>
-	</filter-mapping>
-	
-	
-	<!-- DM Share -->
-	<filter>
-	    <filter-name>urlRewrite-ShareFilter</filter-name>
-	    <filter-class>it.softecspa.portal.filters.ShareFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>urlRewrite-ShareFilter</filter-name>
-	    <url-pattern>/share/*</url-pattern>
-	</filter-mapping>
-	
-	
-	
-	
-	<!-- Servlet -->
-	
-	
-	<!-- J.A.R.V.I.S - mark 2 -->
-	<servlet>
-		<servlet-name>Mark2</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>mark-II</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.Mark2PR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>Mark2</servlet-name>
-		<url-pattern>/jarvis</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- J.A.R.V.I.S  mark 1 -->
-	<servlet>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>backdoor-panel</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<url-pattern>/backdoor-panel</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>BackdoorPanel</servlet-name>
-		<url-pattern>/jarvis1</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Service Status -->
-	<servlet>
-		<servlet-name>ServicesStatus</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-status</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<!-- Clone della servlet BackdoorPanel che necessita di SSO -->
-	<servlet-mapping>
-		<servlet-name>ServicesStatus</servlet-name>
-		<url-pattern>/services-status</url-pattern>
-	</servlet-mapping>
-		
-	
-	
-	<!-- Master Status -->
-	<servlet>
-		<servlet-name>MasterSlave</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>master-slave</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.MasterSlavePR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>MasterSlave</servlet-name>
-		<url-pattern>/master-slave</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Service Synchro -->
-	<servlet>
-		<servlet-name>ServicesSynchro</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-synchro</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.ServicesSynchroPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ServicesSynchro</servlet-name>
-		<url-pattern>/services-synchro</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- @deprecated - Service Images -->
-	<servlet>
-		<servlet-name>ServicesImages</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>services-images</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.ServicesImagesPR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ServicesImages</servlet-name>
-		<url-pattern>/services-images</url-pattern>
-	</servlet-mapping>	
-		
-		
-	<!-- Startup -->
-	<servlet>
-		<servlet-name>WebApp</servlet-name>
-		<servlet-class>it.softecspa.portal.InitWebApp</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>WebApp</servlet-name>
-		<url-pattern>/WebApp</url-pattern>
-	</servlet-mapping>
-	
-	
-	
-	<!-- DOWNLOAD-SERVICE - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione dei downloade dello store</description>	
-		<display-name>Store Service Servlet</display-name>
-		<servlet-name>StoreServiceServlet</servlet-name>
-		<servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class>
-		<init-param>
-			<param-name>SecurityManager</param-name>
-			<param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value>
-		</init-param>
-		<init-param>
-			<param-name>servletCode</param-name>
-			<param-value>store</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ProcessRequest</param-name>
-			<param-value>it.softecspa.portal.processRequest.StorePR</param-value>
-		</init-param>
-		<init-param>
-			<param-name>ErrorJsp</param-name>
-			<param-value>/error.jsp</param-value>
-		</init-param>
-		<!-- 
-		<servlet-class>it.softecspa.desktopmate.services.store.StoreServlet</servlet-class>
-		 -->
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>StoreServiceServlet</servlet-name>
-		<url-pattern>/store</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- POST-SERVICE - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la comunicazione tra server e device</description>	
-		<display-name>Device-Statement Servlet</display-name>
-		<servlet-name>DeviceStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.deviceservices.DeviceStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>DeviceStatementServlet</servlet-name>
-		<url-pattern>/services-post/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- NOTIFY REMOTE RENEWAL - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la notifica dei pagamenti eseguiti in remoto</description>		
-		<display-name>Renewal Notification Servlet</display-name>
-		<servlet-name>NotifyRemoteRenewal</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.otherservices.NotifyRemoteRenewal</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>NotifyRemoteRenewal</servlet-name>
-		<url-pattern>/notify</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi push - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione remota dei serivzi push</description>		
-		<display-name>Push-Statement Servlet</display-name>
-		<servlet-name>PushStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.pushservices.PushStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PushStatementServlet</servlet-name>
-		<url-pattern>/services-push/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi autorizzativi e di profilo - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la gestione dei servizi amministrativi</description>		
-		<display-name>Auth-Statement Servlet</display-name>
-		<servlet-name>AuthStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.authservices.AuthStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AuthStatementServlet</servlet-name>
-		<url-pattern>/authentication-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di esportazione - servlet -->
-	<servlet>
-		<description>Servlet utilizzata per la esportazione dei dati</description>		
-		<display-name>Exporter-Statement Servlet</display-name>
-		<servlet-name>ExporterStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.connectors.ExporterStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ExporterStatementServlet</servlet-name>
-		<url-pattern>/connector-export/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di portale con autenticazione - servlet -->
-	<servlet>
-		<description>Servlet di portale servizi con autenticazione</description>		
-		<display-name>Portal-Statement (authenticated) Servlet</display-name>
-		<servlet-name>AuthPortalStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.portalservices.auth.AuthenticatedStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AuthPortalStatementServlet</servlet-name>
-		<url-pattern>/portal-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi di portale con guest - servlet -->
-	<servlet>
-		<description>Servlet di portale servizi</description>		
-		<display-name>Portal-Statement (guest) Servlet</display-name>
-		<servlet-name>GuestPortalStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.portalservices.guest.GuestStatement</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GuestPortalStatementServlet</servlet-name>
-		<url-pattern>/portal-service-guest/statement</url-pattern>
-	</servlet-mapping>
-			
-			
-	<!-- Gestione servizi di interconnesione a MyDesktopmate - servlet -->
-	<servlet>
-		<description>Servlet collegamento con MyDesktopmate</description>		
-		<display-name>MyDesktopmate-Statement Servlet</display-name>
-		<servlet-name>MyDesktopmateStatementServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.my.services.ConnectorStatement</servlet-class>
-	</servlet>		
-	<servlet-mapping>
-		<servlet-name>MyDesktopmateStatementServlet</servlet-name>
-		<url-pattern>/mydesktopmate-service/statement</url-pattern>
-	</servlet-mapping>
-	
-	
-	<!-- Gestione servizi geoip - servlet 
-	<servlet>
-		<description>Servlet servizi geoip</description>		
-		<display-name>GeoIP-Statement Servlet</display-name>
-		<servlet-name>GeoipServiceServlet</servlet-name>
-		<servlet-class>it.softecspa.desktopmate.geoip.GeoIP</servlet-class>
-	</servlet>			
-	<servlet-mapping>
-		<servlet-name>GeoipServiceServlet</servlet-name>
-		<url-pattern>/geoip/service</url-pattern>
-	</servlet-mapping>	
-	-->		
-			
-	<!-- MONITOR - servlet -->
-	<servlet>
-		<description>Servlet di monitoraggio standard</description>				
-		<display-name>Monitor Servlet</display-name>
-		<servlet-name>Monitor</servlet-name>
-		<servlet-class>it.softecspa.portal.Monitor</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>Monitor</servlet-name>
-		<url-pattern>/monitor</url-pattern>
-	</servlet-mapping>
-	
-	
-
-	<session-config>
-		<!-- Sono Minuti -->
-		<session-timeout>30</session-timeout>
-	</session-config>
-
-	<mime-mapping>
-		<extension>html</extension>
-		<mime-type>text/html</mime-type>
-	</mime-mapping>
-	
-	<mime-mapping>
-		<extension>dtd</extension>
-		<mime-type>text/plain</mime-type>
-	</mime-mapping>
-	
-	
-	
-	
-	
-	
-	
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/conf/liliana/staging/conf/log4j.xml b/conf/liliana/staging/conf/log4j.xml
deleted file mode 100644
index 88589a8..0000000
--- a/conf/liliana/staging/conf/log4j.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-
-	<!-- APPLICATION LOG -->
-	<appender name="rootFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web124/log/ROOT" />
-		<param name="Prefix" value="${hostname}_service." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->    
-			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
-		</layout> 	
-	</appender>
-
-    <!-- RELOAD LOG -->
-	<appender name="reloadFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web124/log/ROOT/reload" />
-		<param name="Prefix" value="${hostname}_node." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- STATS LOG -->
-	<appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web124/log/ROOT/pool" />
-		<param name="Prefix" value="${hostname}_c3p0." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- DRAFT DATA STATS LOG -->
-	<appender name="draftDataFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web124/log/ROOT/draft" />
-		<param name="Prefix" value="${hostname}_draft." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- STATEMENTS STATISTICS LOG -->
-	<appender name="statementFile" class="it.softecspa.kahuna.log.DatedFileAppender">
-		<param name="Directory" value="/var/www/web124/log/ROOT/statement" />
-		<param name="Prefix" value="${hostname}_statement." />
-		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="30" />				
-		<layout class="org.apache.log4j.PatternLayout">																							
-        	<param name="ConversionPattern" value="%m%n" />         
-		</layout> 	
-	</appender>
-
-	<!-- LOGGER SPECIFICI 
-	<category name="access" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="accessFile" />        
-	</category> -->
-	
-	<category name="application" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<category name="it.softecspa" additivity="false">
-    	<priority value="DEBUG" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log di gestione della librera dbConnect -->
-	<category name="it.softecspa.database.dbconnect" additivity="false">
-    	<priority value="ERROR" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log di gestione della librera DM SSO -->
-	<category name="it.softecspa.DMSSO" additivity="false">
-    	<priority value="TRACE" />
-    	<appender-ref ref="rootFile" />    	
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio delle query SQL
-	     Impostare a TRACE per visualizzare le query -->
-	<category name="it.softecspa.database.dbconnect.SQL" additivity="false">
-    	<priority value="TRACE" />	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
-	     Impostare a INFO per tracciare le statistiche -->
-	<category name="it.softecspa.database.c3p0.stats" additivity="false">
-    	<priority value="OFF" />
-    	<appender-ref ref="c3p0StatsFile" />
-	</category>
-	
-	<!-- Logger utilizzato per il monitoraggio delle chiamate
-	     Impostare a INFO per tracciare le chiamate -->	
-	<category name="it.softecspa.desktopmate.STATEMENT" additivity="false">
-		<priority value="INFO" />
-    	<appender-ref ref="statementFile" />
-	</category>
-	
-	<!-- Log da utilizzare nelle JSP -->
-	<category name="it.softecspa.JSP" additivity="false">
-    	<priority value="DEBUG" />    	
-    	<appender-ref ref="rootFile" />        
-	</category>
-	
-	<!-- Log per il servizio di posta
-	<category name="kahuna.mail" additivity="false">
-    	<priority value="DEBUG" />    	  
-    	<appender-ref ref="rootFile" />    	
-	</category>	-->
-	
-	<!-- Log specifico del componente c3p0 per la gestione del connection pool  -->
- 	<category name="com.mchange" additivity="false">
-    	<priority value="INFO" />    	
-    	<appender-ref ref="rootFile" />  
-	</category>	
-	
-	<!-- Monitoraggio del reload del contesto.
-		 Utilizzato principalmente per monitore i riavvii dei nodi -->
-   	<category name="reload" additivity="false">
-    	<priority value="INFO" />
-    	<appender-ref ref="reloadFile" />
-	</category>
-	
-	<!-- Monitoraggio delle interrogazioni draft -->
-   	<category name="draft.data" additivity="false">
-    	<priority value="INFO" />
-    	<appender-ref ref="draftDataFile" />
-	</category>
-	
-	<!-- ROOT -->
-	<root>
-		<priority value="ERROR"/> 
-        <appender-ref ref="rootFile"/>
-	</root>
-</log4j:configuration>
diff --git a/conf/liliana/staging/conf/portal_settings.xml b/conf/liliana/staging/conf/portal_settings.xml
deleted file mode 100644
index 7504efa..0000000
--- a/conf/liliana/staging/conf/portal_settings.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Applicazione DesktopaMate 2.0 - staging</comment>
-
-	<!-- Mappatura DataSource, JWebber -->
-	<entry key="datasource.cms">jdbc/dm-stage#MYSQL</entry>
-	<!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> -->
-	 
-	<!-- Mappatura DataSource, applicazione 
-	     in caso di più datasource separare la lista con la "virgola" -->
-	<entry key="datasource.application">jdbc/dm-master#MYSQL,jdbc/dm-stage#MYSQL</entry>
-	<!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry> -->
-	 
-	<!-- NOTA
-		 Il primo database in lista deve essere obbligatoriamente quello MASTER
-		 Il secondo quello di STAGE. Sono obbligatori entrambi
-		 
-		 Nel caso sia specificato quello in sola lettura, valgono le stesse regole
-	 -->
-	
-	<!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat 
-	     Utilizzare la varibile ${hostname} -->
-	<entry key="cluster.mask">web124.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> 	
-	<entry key="cluster.backplane.mask">web124.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> 
-	
-	<entry key="jarvis.header.color">#44F025</entry>
-	
-	<entry key="application.domain">stage-service.dev.desktopmate.net</entry>
-	<!-- Application context name, leave it blank if there isn't a context 
-	<entry key="application.context.name"></entry> -->
-	
-	<!-- <entry key="application.http.port">80</entry>   		leave it blank for default port 80 -->
-	<!-- <entry key="application.https.port">8443</entry>		leave it blank for default port 443 -->
-	
-	<!-- Time after that the page will be redirect 
-	<entry key="TIME_REDIRECT_PAGE">4</entry> -->
-	
-	<entry key="application.title">DesktopMate (Staging version)</entry>
-	
-	<!-- NOTA: prefisso file di configurazione lingua e path immagini -->
-	<entry key="application.name">dmservice</entry>
-	<entry key="application.environment">staging</entry>
-	
-	<entry key="language.default">en</entry>	
-	<entry key="base.url">http://stage-service.dev.desktopmate.net</entry>
-	
-	<!-- Autocensus username -->
-	<entry key="autocensus.login">true</entry>
-	<entry key="autocensus.profile">DOWNLOADER</entry>
-	
-	<!-- Configurazione propria dell'applicazione -->	
-	<entry key="admin.policy.id">SA</entry>
-	
-	<!-- Formato della data in visualizzazione -->
-	<entry key="standard.datetime.format">dd/MM/yyyy HH:mm:ss</entry>
-	<entry key="standard.date.format">dd/MM/yyyy</entry>
-	
-	
-	<!-- Policies -->
-	<entry key="policy.SA">SA</entry>
-	<entry key="policy.ADMIN">ADMIN</entry>
-	
-	
-	
-	<!-- Server di posta e webmaster -->
-  	<entry key="mail.enable">true</entry>
-	
-	<!-- <entry key="mail.smtp.host">smtp-out.softecspa.it</entry> provvisorio -->
-	<entry key="mail.smtp.host">localhost</entry>
-	<entry key="mail.smtp.localhost"></entry>
-	<entry key="mail.smtp.user"></entry>
- 	<entry key="mail.smtp.password"></entry>
-  	
-  	<entry key="mail.from">dm-web124-service@desktopmate.net</entry>
-  	<entry key="mail.to">massimiliano.veroni@softecspa.it</entry>
-  	<entry key="mail.cc"></entry>
-  	<entry key="mail.bcc"></entry>
-  	<entry key="mail.subject">DesktopMate - web124 -</entry>
-  	
-	<!-- Se 'true' invia una mail al riavvio del sistema 
-	     Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione -->
-	<entry key="mail.start.enable">false</entry>
-	
-	<!-- Invia una mail al verificarsi di un errore non gestito, default 'false' -->
-	<entry key="mail.error.enable">true</entry>
-
-	<!-- Invia una mail al verificarsi di un errore SQL, default 'false' -->
-	<entry key="mail.sqlerror.enable">true</entry>
-	
-	<!-- Invia una mail quando arriva un nuovo modello di device, default 'false' -->
-	<entry key="mail.new-device-model.enable">false</entry>
-	
-	<!-- Abilitazione sistema di recupero messaggi push non inviati al reload del contesto, default 'false' -->
-	<entry key="push.recovery.enable">true</entry>
-	
-	
-	
-	<!-- Paginazione 
-	<entry key="line4page">6</entry>	
-	<entry key="max.segue">6</entry>
-	-->
-	
-</properties>	 
\ No newline at end of file
diff --git a/conf/liliana/staging/conf/sso.xml b/conf/liliana/staging/conf/sso.xml
deleted file mode 100644
index b756619..0000000
--- a/conf/liliana/staging/conf/sso.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Configurazione SSO DNA</comment>
-
-    <entry key="cookie.enable">true</entry>
-	<entry key="cookie.domain">dev.desktopmate.net</entry>
-
-	<!-- Identificativi del client sul server SSO -->
-	<entry key="client.id">dmservice</entry>
-	<entry key="client.secret">d1906cca-d858-4420-ba54-f8c0984883bd</entry>
-	<entry key="default.scope">userinfo</entry>
-	<entry key="default.organization">SOFTEC</entry>
-	
-	<entry key="oauth2.server">http://dmsso.dev.desktopmate.net/dmsso</entry>
-	<entry key="oauth2.server.signature">9c5a523d-e3b1-4611-968b-c0e9207394fa:a9eaecee-387e-43ff-84ae-e2d77d3e4d1b</entry>
-	
-	<!-- Endpoint del serve SSO -->
-	<entry key="authorization.endpoint">${oauth2.server}/oauth2/authorize</entry>
-	<entry key="token.endpoint">${oauth2.server}/oauth2/token</entry>
-	<entry key="token.info.endpoint">${oauth2.server}/v1/tokeninfo</entry>
-	<entry key="user.info.endpoint">${oauth2.server}/v1/userinfo</entry>
-	<entry key="change.password.endpoint">${oauth2.server}/admin</entry>
-	<entry key="logout.endpoint">${oauth2.server}/logout</entry>
-	
-	<!-- Url di ritorno del server locale -->
-	<entry key="redirect.uri">http://stage-service.dev.desktopmate.net/jarvis</entry>
-	<entry key="logout.uri">http://stage-service.dev.desktopmate.net/jarvis?sso_status=LOGOUT</entry>
-	<entry key="error.uri">http://stage-service.dev.desktopmate.net/jarvis?sso_status=ERROR</entry>
-			
-</properties>	 
\ No newline at end of file
diff --git a/conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png b/conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png
deleted file mode 100644
index c4a8d06..0000000
Binary files a/conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png b/conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png
deleted file mode 100644
index 7270483..0000000
Binary files a/conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png b/conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png
deleted file mode 100644
index 7b3360e..0000000
Binary files a/conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png b/conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png
deleted file mode 100644
index d779348..0000000
Binary files a/conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/background-image.png b/conf/liliana/staging/image-pack/background-image.png
deleted file mode 100644
index 4cfbcbb..0000000
Binary files a/conf/liliana/staging/image-pack/background-image.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png b/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png
deleted file mode 100644
index 0ec13e5..0000000
Binary files a/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png b/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png
deleted file mode 100644
index e75f415..0000000
Binary files a/conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png b/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png
deleted file mode 100644
index bd58277..0000000
Binary files a/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png and /dev/null differ
diff --git a/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png b/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png
deleted file mode 100644
index dbabe0e..0000000
Binary files a/conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png and /dev/null differ
diff --git a/conf/liliana/staging/version.xml b/conf/liliana/staging/version.xml
deleted file mode 100644
index 09f4402..0000000
--- a/conf/liliana/staging/version.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>Version information</comment>
-
-	<entry key="version.number">2.10.18</entry> 				
-	<entry key="version.release"></entry>
-	<entry key="build.number">1820</entry> 			
-	<entry key="build.date">13/06/2014 12:30</entry>
-	<entry key="build.installation">liliana/staging</entry>
-	
-</properties>
diff --git a/conf/version.properties b/conf/version.properties
index dccfff1..07abd93 100644
--- a/conf/version.properties
+++ b/conf/version.properties
@@ -1,6 +1,6 @@
 #Build Number for ANT. Do not edit!
-#Fri Jun 13 12:30:23 CEST 2014
-build.number=1821
+#Wed Jun 25 14:56:57 CEST 2014
+build.number=7
 version.release=
-build.date=13/06/2014 12\:30
-version.number=2.10.18
+build.date=25/06/2014 14\:56
+version.number=1.0.0
diff --git a/packaging.xml b/packaging.xml
index dce0fb0..98cf437 100644
--- a/packaging.xml
+++ b/packaging.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="help" name="AppBike Server TRUNK">
+<project basedir="." default="help" name="HttpFileProxy - ADT - Deploy">
 	<!-- Build.xml - versione 2.0.0 -->
 
 	
@@ -11,13 +11,6 @@
 
 	<target name="help">
 		<echo>Help..</echo>
-		<echo>* Reverse database STAGING:  	Crea le classi secondo lo standard dbConnect a partire dal database di STAGE (web124)</echo>
-		<echo>* Reverse database SVILUPPO: 	Crea le classi secondo lo standard dbConnect a partire dal database di SVILUPPO (web103)</echo>
-		<echo>&#xD;</echo>
-		<echo>* dist-PRODUCTION:			Crea il file WAR per la distribuzione in PRODUZIONE sul contesto principale</echo>
-		<echo>* dist-liliana/STAGING:		Crea il file WAR per la distribuzione in su STAGE</echo>
-		<echo>* dist-liliana/SVILUPPO:		Crea il file WAR per la distribuzione in su SVILUPPO</echo>
-		<echo>&#xD;</echo>		
 		
 		
  	</target>
@@ -27,17 +20,17 @@
 	
 	
 	<!-- Ambiente sviluppo -->
-	<target name="dist - liliana/SVILUPPO (liliana/web103)" description="Costruzione del pacchetto per l'ambiente di test" depends="sub-include-AntContrib,sub-include-JSCH">
+	<target name="dist - mwm.dev.ctsapplication.it - /adt_proxyfile - liliana (web144db2) - TEST" description="Costruzione del pacchetto per l'ambiente di test" depends="sub-include-AntContrib,sub-include-JSCH">
 		
 		<antcallback antfile="${basedir}/mycredential.xml" target="credential.liliana" return="var.cert,var.usr,var.pwd,var.tomcat.usr,var.tomcat.pwd" />
-		<property name="var.web" value="web103" />	
-		<property name="var.ctx" value="ROOT" />	
+		<property name="var.web" value="web144" />	
+		<property name="var.ctx" value="adt_fileproxy" />	
 		
 		<antcallback antfile="${basedir}/builder.xml" target="dist" return="project.dist,warfile.name">
 			<!-- <param name="config.cliente" value=""/> -->
-			<param name="config.prefix" value="liliana_dev_"/>
-			<param name="config.dir" value="liliana/develop"/>
-			<param name="new.relic" value="FileProxyServer ADT (production)"/>
+			<param name="config.prefix" value="adt_liliana_test_"/>
+			<param name="config.dir" value="ADT/test-liliana"/>
+			<param name="new.relic" value="FileProxyServer ADT (test)"/>
 		</antcallback>
 		
 		<ant antfile="${basedir}/deployer-script.xml" inheritAll="false" target="uploadAndDeploy" >
@@ -72,7 +65,7 @@
 			<!-- <param name="config.cliente" value=""/> -->
 			<param name="config.prefix" value="product_root_"/>
 			<param name="config.dir" value="desktopmate.net/ROOT"/>
-			<param name="new.relic" value="FileProxyServer ADT (develop)"/>
+			<param name="new.relic" value="FileProxyServer ADT (production)"/>
 		</antcallback>
 		
 		<ant antfile="${basedir}/deployer-script.xml" inheritAll="false" target="uploadAndDeploy" >
@@ -94,100 +87,7 @@
 	
 	
 	
-	<target name=">> Reverse database SVILUPPO (web350)"  description="Reverse del database di stage">
-		<antcall target="sub-reverseDatabase">
-			<param name="param.target" value="SVILUPPO"/>	
-			<param name="param.database" value="web350db1"/>
-			<param name="param.username" value="web350u1"/>
-			<param name="param.password" value="98c7EwXJS7"/>
-		</antcall>
-	</target>
-
-	
-	<target name="&gt;-- Switch to SVILUPPO (web350)"  description="Cambia le configurazioni per lavorare su DEV">
-		<antcall target="sub-switch">
-			<param name="param.title" value="SVILUPPO (web350)"/>
-			<param name="param.source" value="context-liliana-web350db1.xml"/>
-		</antcall>
-	</target>
-	
-	
 	
-	<target name="&gt;-- Switch to PROD (web??)"  description="Cambia le configurazioni per lavorare su PRODUZIONE">
-		<antcall target="sub-switch">
-			<param name="param.title" value="PRODUZIONE (web??)"/>
-			<param name="param.source" value="context-root-PROD.xml"/>
-		</antcall>
-	</target>
 	
-	<target name="sub-switch">
-		<echo>Switch context.xml to ${param.title}</echo>
-		<copy file="${basedir}/conf/myMETA-INF/${param.source}" tofile="${basedir}/WebContent/META-INF/context.xml" overwrite="true" verbose="false"/>
-		
-		<delete>
-			<fileset dir="${basedir}/WebContent/META-INF" includes="**.txt" excludes="."/>
-		</delete>
-		
-		
-		
-		<property name="myfile" value="${basedir}/WebContent/META-INF/${param.title}.txt" />	
-		<echo file="${myfile}" append="true">context.xml from ${basedir}/conf/myMETA-INF/${param.source}&#xD;</echo>
-		
-		<antcall target="refresh" />
-	</target>
-	
-	
-	
-	<target name="sub-reverseDatabase">
-
-		<!-- Richiesta di conferma -->
-		<input message="Confermi la rigenerazione della struttura dati, database ${param.target}?" 
-			   validargs="S,n" 
-			   addproperty="input.response"
-			   defaultvalue="S"/>
-		<condition property="do.abort">
-			<not>
-				<equals arg1="S" arg2="${input.response}" />
-			</not>
-		</condition>
-		<fail if="do.abort">Operazione annullata dall'utente</fail>
-		
-		
-		<taskdef name="reverser" classname="it.softecspa.database.reverser.ReverserAnt" >
-			<classpath >
-				<pathelement location="${basedir}/lib/common/local/dbConnect_1.7.1.jar"/>
-				<pathelement location="${basedir}/lib/common/local/kahuna5j_4.2.3.jar"/>
-				<pathelement location="${basedir}/lib/common/log4j-1.2.15.jar"/>
-				<pathelement location="${basedir}/lib/jdbc/mysql-connector-java-5.0.8-bin.jar"/>
-			</classpath>
-		</taskdef>
-
-		<property name="exclude" value="(cms_.*)|(iso.*)" />
-		<echo>Esclude rule: ${exclude}</echo>
-		
-		<!-- (master)
-			user="web103u2"98c7EwXJS7
-			password="GOoRoTj5K5"
-		-->
-		<!-- DB SVILUPPO (stage) -->
-		<reverser 	description="Reverser" 
-	   		 		driver="com.mysql.jdbc.Driver"
-	   		 		user="${param.username}"
-					password="${param.password}"
-					url="jdbc:mysql://localhost:3306/${param.database}?autoReconnect=true"
-					root="${basedir}/src"
-					package="it.softecspa.appbike.db"
-					exclude="${exclude}"
-					prefixlength="4"
-					deletewithcancel="true"
-					updaterecordtimestamp="true"
-					blockalonechar="true"
-					clonable="true"
-		/>
-		
-
-		<antcall target="refresh" />
-
-	</target>
 	
 </project>
\ No newline at end of file
diff --git a/src/conf/portal_settings.xml b/src/conf/portal_settings.xml
index 9a8ee97..2f8b326 100644
--- a/src/conf/portal_settings.xml
+++ b/src/conf/portal_settings.xml
@@ -60,4 +60,18 @@
 	<!-- Invia una mail al verificarsi di un errore non gestito, default 'false' -->
 	<entry key="mail.error.enable">false</entry>
 		
+		
+	<!-- Valori che servono per criptare la password 
+	     Questo modulo è legato al databse della workflow -->
+	<entry key="chiaveCifraturaSimmetrica"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> 
+	<entry key="chiaveCifraturaPassword"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> 
+	<entry key="salt">&amp;s@(dfghdgféè*a+$2lnd</entry>
+	<entry key="Base64">true</entry>
+	<entry key="DoubleMd5"></entry>	
+	
+	
+	<entry key="POL_SA">SA</entry>
+	<entry key="POL_ADMIN">ADMIN</entry>
+	<entry key="POL_UP_DOWN">UP_DOWN</entry>
+		
 </properties>	 
\ No newline at end of file
diff --git a/src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java b/src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java
index 2fab59a..1acc0b8 100644
--- a/src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java
+++ b/src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java
@@ -4,7 +4,13 @@ import it.softecspa.fileproxy.services.common.core.request.UniversalRequest;
 
 public interface GlobalHttpProxyRequest extends UniversalRequest {
 	
-	
+	public String getUsername();
+
+	public void setUsername(String username);
+
+	public String getPassword();
+
+	public void setPassword(String password);
 		
 	
 }
diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java b/src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java
index 565f57c..77c4865 100644
--- a/src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java
+++ b/src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java
@@ -1,6 +1,6 @@
 package it.softecspa.fileproxy.proxyservices.manager;
 
-import it.softecspa.fileproxy.proxyservices.manager.core.NullSession;
+import it.softecspa.fileproxy.proxyservices.manager.core.WorkflowSession;
 import it.softecspa.fileproxy.proxyservices.request.AbstractHttpFileProxyRequest;
 import it.softecspa.fileproxy.proxyservices.response.AbstractHttpFileProxyResponse;
 import it.softecspa.fileproxy.services.ServerCacheFactory;
@@ -8,14 +8,9 @@ import it.softecspa.fileproxy.services.common.CheckerException;
 import it.softecspa.fileproxy.services.common.ManagerException;
 import it.softecspa.fileproxy.services.common.ResponseOutcome;
 import it.softecspa.fileproxy.services.common.core.UniversalManager;
-import it.softecspa.kahuna.io.File;
 
 
-public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFileProxyRequest, O extends AbstractHttpFileProxyResponse> extends UniversalManager <I,O,NullSession<I>> {
-	
-	
-	boolean logRequestInfo;
-	
+public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFileProxyRequest, O extends AbstractHttpFileProxyResponse> extends UniversalManager <I,O,WorkflowSession<I>> {
 	
 	
 	@Override
@@ -25,18 +20,14 @@ public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFilePro
 	
 	
 	@Override
-	protected NullSession<I> buildAndValidateSession(ServerCacheFactory cacheInfo, boolean stageMode) throws CheckerException, ManagerException {
+	protected WorkflowSession<I> buildAndValidateSession(ServerCacheFactory cacheInfo, boolean stageMode) throws CheckerException, ManagerException {
 		
-		//try {
-			// Creo l'istanza dell'oggetto di sessione DM
-			session = new NullSession(cacheInfo, request, true, null);
-			
-			return session;
-		/*
-		} catch (SQLException e) {
-			throw new ManagerException(e);
-		}
-		*/
+		// Creo l'istanza dell'oggetto di sessione DM
+		session = new WorkflowSession<I>(cacheInfo, request, true, cmReadonly);
+		
+		session.validate();
+		return session;
+
 	}
 	
 	/**
@@ -59,6 +50,7 @@ public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFilePro
 		return ServerCacheFactory.getInstance().getResourceRoot() + _path;
 	}
 	
+	
 	/**
 	 * Controlla la presenza di caratteri speciali non accettati dai path
 	 * @param da_controllare
diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java b/src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java
deleted file mode 100644
index d2de4b9..0000000
--- a/src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package it.softecspa.fileproxy.proxyservices.manager.core;
-
-import it.softecspa.database.dbconnect.ConnectionManager;
-import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest;
-import it.softecspa.fileproxy.services.ServerCacheFactory;
-import it.softecspa.fileproxy.services.common.CheckerException;
-import it.softecspa.fileproxy.services.common.core.UniversalSession;
-
-import java.sql.SQLException;
-
-public class NullSession<I extends GlobalHttpProxyRequest> extends UniversalSession<I> {
-	
-
-	public NullSession(ServerCacheFactory cache, I request, boolean stage, ConnectionManager cmReadonly) {
-		super(cache, request, stage, cmReadonly);
-	}
-
-	@Override
-	public void validate() throws CheckerException, SQLException {
-		
-		
-	}
-
-	
-
-	
-}
diff --git a/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
new file mode 100644
index 0000000..dcfae3a
--- /dev/null
+++ b/src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
@@ -0,0 +1,76 @@
+package it.softecspa.fileproxy.proxyservices.manager.core;
+
+import it.softecspa.database.dbconnect.ConnectionManager;
+import it.softecspa.database.dbconnect.DatabaseStatementUnplugged;
+import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest;
+import it.softecspa.fileproxy.services.ServerCacheFactory;
+import it.softecspa.fileproxy.services.common.CheckerException;
+import it.softecspa.fileproxy.services.common.ManagerException;
+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.exceptions.AuthenticationException;
+import it.softecspa.portal.Parameters;
+
+import java.sql.SQLException;
+
+public class WorkflowSession<I extends GlobalHttpProxyRequest> extends UniversalSession<I> {
+	
+
+	public WorkflowSession(ServerCacheFactory cache, I request, boolean stage, ConnectionManager cmReadonly) {
+		super(cache, request, stage, cmReadonly);
+	}
+
+	@Override
+	public void validate() throws ManagerException, CheckerException  {
+		/*
+		 * Verifico le credenziali utente passate nella request
+		 */
+		
+		if (XString.isBlankNullTrim(request.getUsername())) {
+			throw new CheckerException(ResponseOutcome.USERNAME_MANDATORY);
+		}	
+		if (XString.isBlankNullTrim(request.getPassword())) {
+			throw new CheckerException(ResponseOutcome.PASSWORD_MANDATORY);
+		}
+		
+		
+		// Verifica credenziali su database workflow collegato
+		Utente utente = new Utente();
+		utente.setUserName(request.getUsername());
+		try {
+			utente.setPassword(request.getPassword());
+		} catch (Exception e) {
+			throw new ManagerException("Error encoding password",e);
+		}
+		
+		DatabaseStatementUnplugged dbsu;
+		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);
+			}
+			
+		} 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);
+		}
+		
+	}
+
+	
+
+	
+}
diff --git a/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java b/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java
index 81c6f04..238e72d 100644
--- a/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java
+++ b/src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java
@@ -6,7 +6,6 @@ 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.UniversalAuthenticatedRequest;
 
 
 public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyRequest, RemoteHostRequestInfo, TrackRequestInfo {
@@ -21,23 +20,27 @@ public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyReq
 	// TrackRequestInfo
 	private boolean traceRequestInfo;
 		
-	
+	// GlobalHttpProxyRequest
 	private String username;
 	private String password;
 	
 
+	@Override
 	public String getUsername() {
 		return username;
 	}
 
+	@Override
 	public void setUsername(String username) {
 		this.username = username;
 	}
 
+	@Override
 	public String getPassword() {
 		return password;
 	}
 
+	@Override
 	public void setPassword(String password) {
 		this.password = password;
 	}
diff --git a/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java b/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java
index da7cb82..506c42a 100644
--- a/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java
+++ b/src/it/softecspa/fileproxy/services/common/ResponseOutcome.java
@@ -197,6 +197,8 @@ public enum ResponseOutcome {
 		, ORGANIZATION_NOT_MATCH_TOKEN_INFO	(90539,"Organization not match token info")
 		, SESSION_LOGIN_WEB_ERROR			(90540,"Error loading session login for web")
 		
+		, USER_POLICY_NO_VALID				(90543,"User with not valid policy")
+		, USERNAME_MANDATORY				(90544,"Username mandatory")
 		, ACCESS_TOKEN_USERNAME_MANDATORY	(90545,"AccessToken or Username are mandatory")
 		, PASSWORD_MANDATORY				(90546,"Password mandatory with username")
 		, TOO_MANY_SSO_LOGIN				(90547,"Too many SSO-LOGIN; problem extracting addional")
@@ -438,6 +440,8 @@ 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")
+		
+		
 		//-----------------
 		
 		
diff --git a/src/it/softecspa/fileproxy/services/common/core/UniversalSession.java b/src/it/softecspa/fileproxy/services/common/core/UniversalSession.java
index e43be37..777e535 100644
--- a/src/it/softecspa/fileproxy/services/common/core/UniversalSession.java
+++ b/src/it/softecspa/fileproxy/services/common/core/UniversalSession.java
@@ -62,7 +62,7 @@ public abstract class UniversalSession <I extends UniversalRequest> {
 		
 	}
 
-	public abstract void validate() throws CheckerException, SQLException;
+	public abstract void validate() throws ManagerException, CheckerException;
 	
 
 	public String getLanguage() {
diff --git a/src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java b/src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java
index 5d2a220..cb934e0 100644
--- a/src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java
+++ b/src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java
@@ -203,7 +203,7 @@ public abstract class UniversalStatementHttpServlet <UREQ extends UniversalReque
 	
 	
 	protected Logger log = Logger.getLogger(getClass());
-	private Logger statementLog = Logger.getLogger("it.softecspa.appbike.STATEMENT");
+	private Logger statementLog = Logger.getLogger("it.softecspa.desktopmate.STATEMENT");
 	
 	
 	
--
libgit2 0.21.4