From 7e1618959316a568d0e002dae82370b708d8ff50 Mon Sep 17 00:00:00 2001
From: m.veroni <m.veroni@edf0334f-4afc-450a-8f92-fe1409970e7d>
Date: Tue, 15 Jul 2014 12:43:07 +0000
Subject: [PATCH] Configurato script per rilascio in produzione

---
 conf/ADT/production/META-INF/context.xml                 |  35 +++++++++++++++++++++++++++++++++++
 conf/ADT/production/WEB-INF/web.xml                      | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/production/conf/log4j.xml                       | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/production/conf/portal_settings.xml             |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 conf/ADT/production/version.xml                          |  12 ++++++++++++
 conf/version.properties                                  |   6 +++---
 database/change_in_progress/20140623 http file proxy.sql |   6 ++++--
 packaging.xml                                            |  10 +++++-----
 8 files changed, 376 insertions(+), 10 deletions(-)
 create mode 100644 conf/ADT/production/META-INF/context.xml
 create mode 100644 conf/ADT/production/WEB-INF/web.xml
 create mode 100644 conf/ADT/production/conf/log4j.xml
 create mode 100644 conf/ADT/production/conf/portal_settings.xml
 create mode 100644 conf/ADT/production/version.xml

diff --git a/conf/ADT/production/META-INF/context.xml b/conf/ADT/production/META-INF/context.xml
new file mode 100644
index 0000000..10d7465
--- /dev/null
+++ b/conf/ADT/production/META-INF/context.xml
@@ -0,0 +1,35 @@
+<?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="" />	  
+
+	<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="web77u12" 
+				password="Ghec56hj" 
+	  			factory="org.apache.naming.factory.BeanFactory" 
+	  			type="com.mchange.v2.c3p0.ComboPooledDataSource" 
+	  			jdbcUrl="jdbc:mysql://mysql-jcluster.backplane:3306/web77db12?autoReconnect=true&amp;characterEncoding=UTF-8" />                  
+</Context>
diff --git a/conf/ADT/production/WEB-INF/web.xml b/conf/ADT/production/WEB-INF/web.xml
new file mode 100644
index 0000000..1592699
--- /dev/null
+++ b/conf/ADT/production/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.2 (17) - ADT/production [15/07/2014 14:39]</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 (production)</param-value>
+	</context-param>	
+	
+	<!-- ADT/production - 15/07/2014 14: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>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/production/conf/log4j.xml b/conf/ADT/production/conf/log4j.xml
new file mode 100644
index 0000000..f99a928
--- /dev/null
+++ b/conf/ADT/production/conf/log4j.xml
@@ -0,0 +1,105 @@
+<?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/web150/log/fileproxy" />
+		<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/web150/log/fileproxy/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="INFO" />    	
+    	<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="OFF" />	
+    	<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="INFO" />    	
+    	<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/production/conf/portal_settings.xml b/conf/ADT/production/conf/portal_settings.xml
new file mode 100644
index 0000000..d0e8891
--- /dev/null
+++ b/conf/ADT/production/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">web150.${hostname(0,3)}.jcluster.softecspa.it:8180</entry> 
+	<!-- <entry key="cluster.backplane.mask">web144.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry>  -->
+	
+	<entry key="application.domain">adt.ctsapplications.it/fileproxy</entry>
+	<!-- Application context name, leave it blank if there isn't a context -->
+	<entry key="application.context.name">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">produzione</entry>
+	
+	<entry key="language.default">en</entry>	
+	<entry key="base.url">http://adt.ctsapplications.it/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">localhost</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 - jcluster -</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/production/version.xml b/conf/ADT/production/version.xml
new file mode 100644
index 0000000..e9a0449
--- /dev/null
+++ b/conf/ADT/production/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.2</entry> 				
+	<entry key="version.release"></entry>
+	<entry key="build.number">17</entry> 			
+	<entry key="build.date">15/07/2014 14:39</entry>
+	<entry key="build.installation">ADT/production</entry>
+	
+</properties>
diff --git a/conf/version.properties b/conf/version.properties
index 48d39cf..0c84693 100644
--- a/conf/version.properties
+++ b/conf/version.properties
@@ -1,6 +1,6 @@
 #Build Number for ANT. Do not edit!
-#Mon Jul 07 15:08:58 CEST 2014
-build.number=12
+#Tue Jul 15 14:39:20 CEST 2014
+build.number=18
 version.release=
-build.date=07/07/2014 15\:08
+build.date=15/07/2014 14\:39
 version.number=1.0.2
diff --git a/database/change_in_progress/20140623 http file proxy.sql b/database/change_in_progress/20140623 http file proxy.sql
index a60bd48..32c54fe 100644
--- a/database/change_in_progress/20140623 http file proxy.sql
+++ b/database/change_in_progress/20140623 http file proxy.sql
@@ -46,5 +46,7 @@ CREATE TABLE `t005_cluster_info` (
 
 
 
-INSERT INTO `t001_config_properties` (`v_key`, `v_value`, `v_description`) VALUES ('haertbeat.delay', '0', 'Heartbeat verso server master'):
-INSERT INTO `t001_config_properties` (`v_key`, `v_value`, `v_description`) VALUES ('resource.root', '/var/www/web77/user/web77_adt', 'Root dei file')
\ No newline at end of file
+INSERT INTO `t001_config_properties` (`v_key`, `v_value`, `v_description`) VALUES ('haertbeat.delay', '0', 'Heartbeat verso server master');
+INSERT INTO `t001_config_properties` (`v_key`, `v_value`, `v_description`) VALUES ('resource.root', '/var/www/web77/DATA/adt/101/ftp', 'Root dei file');
+
+
diff --git a/packaging.xml b/packaging.xml
index 98cf437..2c5c467 100644
--- a/packaging.xml
+++ b/packaging.xml
@@ -55,16 +55,16 @@
 	
 	
 
-	<target name="dist - PRODUCTION (desktopmate.net) (jcluster/web??)" description="Costruzione del pacchetto per l'ambiente di produzione (decktopmate.it)" depends="sub-include-AntContrib">
+	<target name="dist - adt.ctsapplications.it - /fileproxy - jcluster (web150+web77db12)" description="Costruzione del pacchetto per l'ambiente di produzione (ADT)" depends="sub-include-AntContrib">
 			
 		<antcallback antfile="${basedir}/mycredential.xml" target="credential.jcluster" return="var.cert,var.usr,var.pwd,var.tomcat.usr,var.tomcat.pwd" />
-		<property name="var.web" value="web??" />	
-		<property name="var.ctx" value="ROOT" />
+		<property name="var.web" value="web150" />	
+		<property name="var.ctx" value="fileproxy" />
 		
 		<antcallback antfile="${basedir}/builder.xml" target="dist" return="project.dist,warfile.name">
 			<!-- <param name="config.cliente" value=""/> -->
-			<param name="config.prefix" value="product_root_"/>
-			<param name="config.dir" value="desktopmate.net/ROOT"/>
+			<param name="config.prefix" value="adt_jcluster_"/>
+			<param name="config.dir" value="ADT/production"/>
 			<param name="new.relic" value="FileProxyServer ADT (production)"/>
 		</antcallback>
 		
--
libgit2 0.21.4