Softec-Workflow / ProxyServer ADT

Commit cfc105d60132172069ea93f4ef76cf6eec601b34

Authored by m.veroni
1 parent 47518cd3

Aggiunto nuovo log con ZIP 

git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13421 edf0334f-4afc-450a-8f92-fe1409970e7d
Showing 12 changed files with 67 additions and 32 deletions   Show diff stats
Inline Side-by-side
.classpath
  Show/Hide comments   View file @cfc105d
... ... @@ -118,11 +118,6 @@
118 118 <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
119 119 </attributes>
120 120 </classpathentry>
121   - <classpathentry kind="lib" path="lib/common/local/kahuna5j_4.2.3.jar">
122   - <attributes>
123   - <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
124   - </attributes>
125   - </classpathentry>
126 121 <classpathentry kind="lib" path="lib/common/local/s4_1.0.5.jar">
127 122 <attributes>
128 123 <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
... ... @@ -156,6 +151,11 @@
156 151 <classpathentry kind="lib" path="lib/axis/jaxrpc.jar"/>
157 152 <classpathentry kind="lib" path="lib/axis/saaj.jar"/>
158 153 <classpathentry kind="lib" path="lib/axis/wsdl4j.jar"/>
  154 + <classpathentry kind="lib" path="lib/common/local/kahuna5j_4.3.0.jar">
  155 + <attributes>
  156 + <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
  157 + </attributes>
  158 + </classpathentry>
159 159 <classpathentry kind="src" path="src"/>
160 160 <classpathentry kind="lib" path="lib/jdbc/mysql-connector-java-5.0.8-bin.jar"/>
161 161 <classpathentry kind="lib" path="lib/c3p0/c3p0-0.9.2.jar">
... ...
conf/ADT/production/WEB-INF/web.xml
  Show/Hide comments   View file @cfc105d
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <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">
3   - <display-name>FileProxy 1.0.3 (20) - ADT/production [30/07/2014 17:10]</display-name>
  3 + <display-name>FileProxy 1.0.8 (32) - ADT/production [26/08/2014 15:57]</display-name>
4 4 <!-- Ultime modifiche del 23/06/2014 -->
5 5  
6 6 <!-- Configurazione per New Relic -->
... ... @@ -9,7 +9,7 @@
9 9 <param-value>FileProxyServer ADT (production)</param-value>
10 10 </context-param>
11 11  
12   - <!-- ADT/production - 30/07/2014 17:10 -->
  12 + <!-- ADT/production - 26/08/2014 15:57 -->
13 13 <!-- Configurazioni obbligatorie -->
14 14 <context-param>
15 15 <param-name>ErrorPage</param-name>
... ...
conf/ADT/production/conf/log4j.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -8,7 +8,8 @@
8 8 <param name="Directory" value="/var/www/web150/log/fileproxy" />
9 9 <param name="Prefix" value="${hostname}_service." />
10 10 <param name="Suffix" value=".log" />
11   - <param name="Autoflush" value="15" />
  11 + <param name="Autoflush" value="30" />
  12 + <param name="ArchiveAfter" value="1" />
12 13 <layout class="org.apache.log4j.PatternLayout">
13 14 <!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->
14 15 <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
... ... @@ -21,11 +22,24 @@
21 22 <param name="Directory" value="/var/www/web150/log/fileproxy/statement" />
22 23 <param name="Prefix" value="${hostname}_statement." />
23 24 <param name="Suffix" value=".log" />
24   - <param name="Autoflush" value="15" />
  25 + <param name="Autoflush" value="60" />
  26 + <param name="ArchiveAfter" value="1" />
25 27 <layout class="org.apache.log4j.PatternLayout">
26 28 <param name="ConversionPattern" value="%m%n" />
27 29 </layout>
28 30 </appender>
  31 +
  32 + <!-- STATS LOG -->
  33 + <appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
  34 + <param name="Directory" value="/var/www/web150/log/fileproxy/pool" />
  35 + <param name="Prefix" value="${hostname}_c3p0." />
  36 + <param name="Suffix" value=".log" />
  37 + <param name="Autoflush" value="5" />
  38 + <param name="ArchiveAfter" value="1" />
  39 + <layout class="org.apache.log4j.PatternLayout">
  40 + <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />
  41 + </layout>
  42 + </appender>
29 43  
30 44 <!-- LOGGER SPECIFICI
31 45 <category name="access" additivity="false">
... ... @@ -61,7 +75,7 @@
61 75 <!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
62 76 Impostare a INFO per tracciare le statistiche -->
63 77 <category name="it.softecspa.database.c3p0.stats" additivity="false">
64   - <priority value="OFF" />
  78 + <priority value="TRACE" />
65 79 <appender-ref ref="c3p0StatsFile" />
66 80 </category>
67 81  
... ...
conf/ADT/production/version.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -3,10 +3,10 @@
3 3 <properties>
4 4 <comment>Version information</comment>
5 5  
6   - <entry key="version.number">1.0.3</entry>
  6 + <entry key="version.number">1.0.8</entry>
7 7 <entry key="version.release"></entry>
8   - <entry key="build.number">20</entry>
9   - <entry key="build.date">30/07/2014 17:10</entry>
  8 + <entry key="build.number">32</entry>
  9 + <entry key="build.date">26/08/2014 15:57</entry>
10 10 <entry key="build.installation">ADT/production</entry>
11 11  
12 12 </properties>
... ...
conf/ADT/test-liliana/WEB-INF/web.xml
  Show/Hide comments   View file @cfc105d
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <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">
3   - <display-name>FileProxy 1.0.3 (21) - ADT/test-liliana [30/07/2014 17:15]</display-name>
  3 + <display-name>FileProxy 1.0.8 (31) - ADT/test-liliana [26/08/2014 15:37]</display-name>
4 4 <!-- Ultime modifiche del 23/06/2014 -->
5 5  
6 6 <!-- Configurazione per New Relic -->
... ... @@ -9,7 +9,7 @@
9 9 <param-value>FileProxyServer ADT (test)</param-value>
10 10 </context-param>
11 11  
12   - <!-- ADT/test-liliana - 30/07/2014 17:15 -->
  12 + <!-- ADT/test-liliana - 26/08/2014 15:37 -->
13 13 <!-- Configurazioni obbligatorie -->
14 14 <context-param>
15 15 <param-name>ErrorPage</param-name>
... ...
conf/ADT/test-liliana/conf/log4j.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -8,7 +8,8 @@
8 8 <param name="Directory" value="/var/www/web144/log/adt_test_proxy" />
9 9 <param name="Prefix" value="${hostname}_service." />
10 10 <param name="Suffix" value=".log" />
11   - <param name="Autoflush" value="15" />
  11 + <param name="Autoflush" value="30" />
  12 + <param name="ArchiveAfter" value="1" />
12 13 <layout class="org.apache.log4j.PatternLayout">
13 14 <!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->
14 15 <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
... ... @@ -21,12 +22,25 @@
21 22 <param name="Directory" value="/var/www/web144/log/adt_test_proxy/statement" />
22 23 <param name="Prefix" value="${hostname}_statement." />
23 24 <param name="Suffix" value=".log" />
24   - <param name="Autoflush" value="15" />
  25 + <param name="Autoflush" value="60" />
  26 + <param name="ArchiveAfter" value="1" />
25 27 <layout class="org.apache.log4j.PatternLayout">
26 28 <param name="ConversionPattern" value="%m%n" />
27 29 </layout>
28 30 </appender>
29 31  
  32 + <!-- STATS LOG -->
  33 + <appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
  34 + <param name="Directory" value="/var/www/web144/log/adt_test_proxy/pool" />
  35 + <param name="Prefix" value="${hostname}_c3p0." />
  36 + <param name="Suffix" value=".log" />
  37 + <param name="Autoflush" value="5" />
  38 + <param name="ArchiveAfter" value="1" />
  39 + <layout class="org.apache.log4j.PatternLayout">
  40 + <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />
  41 + </layout>
  42 + </appender>
  43 +
30 44 <!-- LOGGER SPECIFICI
31 45 <category name="access" additivity="false">
32 46 <priority value="INFO" />
... ... @@ -60,7 +74,7 @@
60 74 <!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
61 75 Impostare a INFO per tracciare le statistiche -->
62 76 <category name="it.softecspa.database.c3p0.stats" additivity="false">
63   - <priority value="OFF" />
  77 + <priority value="TRACE" />
64 78 <appender-ref ref="c3p0StatsFile" />
65 79 </category>
66 80  
... ...
conf/ADT/test-liliana/version.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -3,10 +3,10 @@
3 3 <properties>
4 4 <comment>Version information</comment>
5 5  
6   - <entry key="version.number">1.0.3</entry>
  6 + <entry key="version.number">1.0.8</entry>
7 7 <entry key="version.release"></entry>
8   - <entry key="build.number">21</entry>
9   - <entry key="build.date">30/07/2014 17:15</entry>
  8 + <entry key="build.number">31</entry>
  9 + <entry key="build.date">26/08/2014 15:37</entry>
10 10 <entry key="build.installation">ADT/test-liliana</entry>
11 11  
12 12 </properties>
... ...
conf/version.properties
  Show/Hide comments   View file @cfc105d
1 1 #Build Number for ANT. Do not edit!
2   -#Wed Jul 30 17:15:29 CEST 2014
3   -build.number=22
  2 +#Tue Aug 26 15:57:19 CEST 2014
  3 +build.number=33
4 4 version.release=
5   -build.date=30/07/2014 17\:15
6   -version.number=1.0.3
  5 +build.date=26/08/2014 15\:57
  6 +version.number=1.0.8
... ...
deployer-script.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -279,9 +279,16 @@
279 279 <echo>* context = ${context}</echo>
280 280 <echo>* war (locale) = ${warfile.name}</echo>
281 281  
  282 + <!-- Workaround per web150 -->
  283 + <echo message="Undeploy di sicurezza automatico" />
  284 + <antcall target="remote.exec">
  285 + <param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -u -f</param>
  286 + </antcall>
  287 +
  288 +
282 289 <echo message="Deploy automatico" />
283 290 <antcall target="remote.exec">
284   - <param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -c -f</param>
  291 + <param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -f</param>
285 292 </antcall>
286 293  
287 294 <echo>Deploy completato su tutti i nodi</echo>
... ...
lib/common/local/kahuna5j_4.2.3.jar renamed to lib/common/local/kahuna5j_4.3.0.jar
View file @cfc105d
No preview for this file type
src/conf/log4j.xml
  Show/Hide comments   View file @cfc105d
... ... @@ -79,7 +79,7 @@
79 79 <!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
80 80 Impostare a INFO per tracciare le statistiche -->
81 81 <category name="it.softecspa.database.c3p0.stats" additivity="false">
82   - <priority value="OFF" />
  82 + <priority value="TRACE" />
83 83 <appender-ref ref="c3p0Stats" />
84 84 </category>
85 85  
... ...
src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
  Show/Hide comments   View file @cfc105d
1 1 package it.softecspa.fileproxy.proxyservices.manager.core;
2 2  
3 3 import it.softecspa.database.dbconnect.ConnectionManager;
4   -import it.softecspa.database.dbconnect.DatabaseStatementUnplugged;
5   -import it.softecspa.database.dbconnect.NoRecordFoundException;
6 4 import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest;
7 5 import it.softecspa.fileproxy.services.ServerCacheFactory;
8 6 import it.softecspa.fileproxy.services.common.CheckerException;
... ... @@ -13,7 +11,6 @@ import it.softecspa.jwebber.bo.Utente;
13 11 import it.softecspa.kahuna.lang.XString;
14 12 import it.softecspa.mvc.businessobject.DatabaseManager;
15 13 import it.softecspa.mvc.exceptions.AuthenticationException;
16   -import it.softecspa.portal.Parameters;
17 14  
18 15 import java.sql.Connection;
19 16 import java.sql.SQLException;
... ... @@ -66,7 +63,10 @@ public class WorkflowSession&lt;I extends GlobalHttpProxyRequest&gt; extends Universal
66 63 } finally {
67 64 DatabaseManager.closeConnection(connection);
68 65 }
69   -
  66 +
  67 + /*
  68 + * Eliminato per velocizzare la richiesta
  69 + * E' fatta solo la verifica del'utente
70 70 Parameters parameters = Parameters.getInstance();
71 71  
72 72 if (!utente.hasPolicy(parameters.get("POL_SA","SA")) &&
... ... @@ -75,7 +75,7 @@ public class WorkflowSession&lt;I extends GlobalHttpProxyRequest&gt; extends Universal
75 75 log.error("Not valid policy for username '"+request.getUsername()+"'");
76 76 throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID);
77 77 }
78   -
  78 + */
79 79  
80 80  
81 81  
... ...