Commit 9da5a81ff90764c1925d0c6c1cf00a20899f2a2a
1 parent
5704ed85
Versione 1.0.0, fix e rilascio in dev
git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13307 edf0334f-4afc-450a-8f92-fe1409970e7d
Showing
45 changed files
with
403 additions
and
1722 deletions
Show diff stats
WebContent/form/upload.jsp
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | %> |
| 9 | 9 | <html> |
| 10 | 10 | <head> |
| 11 | - <title>Upload file</title> | |
| 11 | + <title>Upload file - test page</title> | |
| 12 | 12 | <meta http-equiv="expires" content="-1"> |
| 13 | 13 | <meta http-equiv="pragma" content="no-cache"> |
| 14 | 14 | <meta http-equiv="cache-control" content="no-cache"> |
| ... | ... | @@ -45,6 +45,21 @@ |
| 45 | 45 | } |
| 46 | 46 | </script> |
| 47 | 47 | <style> |
| 48 | + HTML,BODY { | |
| 49 | + margin-top: 5px; | |
| 50 | + margin-left: 5px; | |
| 51 | + margin-right: 5px; | |
| 52 | + margin-bottom: 5px; | |
| 53 | + /* http://www.google.com/fonts */ | |
| 54 | + font-family: 'Source Sans Pro', Frutiger, Arial, Helvetica, sans-serif; | |
| 55 | + /* font-family: Frutiger, Arial, Helvetica, sans-serif; */ | |
| 56 | + font-size: 14px; | |
| 57 | + font-weight: 400; | |
| 58 | + background-color: white; | |
| 59 | + color: black; | |
| 60 | + height: 100% | |
| 61 | + } | |
| 62 | + | |
| 48 | 63 | .tabella {border:solid 1px #DDDDEE; color:#2b2b2b; } |
| 49 | 64 | .cella {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px;} |
| 50 | 65 | .cellaIntestazione {padding:5px;color:#2b2b2b; background-color:#DDDDEE; font-face:verdana; font-size:14px; font-weight:bold;} |
| ... | ... | @@ -52,66 +67,53 @@ |
| 52 | 67 | </head> |
| 53 | 68 | <body> |
| 54 | 69 | <form name="dati"> |
| 55 | - <table border="0" cellspacing="2" cellpadding="2" class="tabella"> | |
| 56 | - <tr><td colspan="2" class="cellaIntestazione">Simulazione traferimento file</td></tr> | |
| 70 | + <table border="0" cellspacing="1" cellpadding="1" class="tabella"> | |
| 57 | 71 | <tr> |
| 58 | - <td colspan="2" class="cella"> | |
| 59 | - <ul> | |
| 60 | - <li>Incollare XML nella text area</li> | |
| 61 | - <li>La login e la password devono essere quelle di un utente abilitato all'import dei dati (ad esempio un amministratore) </li> | |
| 62 | - <li>Alla fine dell'importazione verrà visualizzato nell'area esito il risultato dell'importazione:</li> | |
| 63 | - </ul> | |
| 64 | - </td> | |
| 72 | + <td class="cella" width="120px"><b>login</b></td> | |
| 73 | + <td class="cella" ><input name="FIELD_USERNAME" type="text"></td> | |
| 65 | 74 | </tr> |
| 66 | 75 | <tr> |
| 67 | - <td class="cella">login</td> | |
| 68 | - <td class="cella"><input name="FIELD_USERNAME" type="text"></td> | |
| 69 | - </tr> | |
| 70 | - <tr> | |
| 71 | - <td class="cella">password</td> | |
| 76 | + <td class="cella"><b>password</b></td> | |
| 72 | 77 | <td class="cella"><input name="FIELD_PASSWORD" type="password"></td> |
| 73 | 78 | </tr> |
| 74 | 79 | |
| 75 | 80 | <tr> |
| 76 | - <td class="cella">path</td> | |
| 81 | + <td class="cella"><b>path</b></td> | |
| 77 | 82 | <td class="cella"><input name="FIELD_PATH" type="text"></td> |
| 78 | 83 | </tr> |
| 79 | 84 | <tr> |
| 80 | - <td class="cella">fileName</td> | |
| 85 | + <td class="cella"><b>fileName</b></td> | |
| 81 | 86 | <td class="cella"><input name="FIELD_FILENAME" type="text"></td> |
| 82 | 87 | </tr> |
| 83 | 88 | <tr> |
| 84 | - <td class="cella">overwrite</td> | |
| 89 | + <td class="cella"><b>overwrite</b></td> | |
| 85 | 90 | <td class="cella"><input name="FIELD_OVERWRITE" type="checkbox" value="true"></td> |
| 86 | 91 | </tr> |
| 87 | 92 | <tr> |
| 88 | - <td class="cella">append</td> | |
| 93 | + <td class="cella"><b>append</b></td> | |
| 89 | 94 | <td class="cella"><input name="FIELD_APPEND" type="checkbox" value="true"></td> |
| 90 | 95 | </tr> |
| 91 | 96 | <tr> |
| 92 | - <td class="cella">bufferLength</td> | |
| 97 | + <td class="cella"><b>bufferLength</b></td> | |
| 93 | 98 | <td class="cella"><input name="FIELD_BUFFER" type="text"></td> |
| 94 | 99 | </tr> |
| 95 | 100 | |
| 96 | 101 | <tr> |
| 97 | - <td class="cella" colspan="2"><input type="button" value="Invia dati" onclick="sendData();"></td> | |
| 102 | + <td class="cella" colspan="2"><input type="button" value="Upload" onclick="sendData();"></td> | |
| 98 | 103 | </tr> |
| 99 | 104 | <tr> |
| 100 | 105 | <td colspan="2" class="cella"> |
| 101 | 106 | <div style="display: inline-block; vertical-align: top;"> |
| 102 | - <div style="display: inline-block; vertical-align: top;"> | |
| 103 | - Invio<br> | |
| 107 | + <div style="display: inline-block; vertical-align: top;"> <b>Input</b><br> | |
| 104 | 108 | <textarea name="FIELD_REQUEST" cols="80" rows="40"></textarea> |
| 105 | 109 | </div> |
| 106 | - <div style="display:inline-block; vertical-align: top;"> | |
| 107 | - Esito<br> | |
| 110 | + <div style="display:inline-block; vertical-align: top;"> <b>Response</b><br> | |
| 108 | 111 | <textarea name="FIELD_RESPONSE" readonly="readonly" cols="50" rows="20"></textarea> |
| 109 | 112 | </div> |
| 110 | 113 | </div> |
| 111 | 114 | </td> |
| 112 | 115 | </tr> |
| 113 | 116 | </table> |
| 114 | - | |
| 115 | 117 | </form> |
| 116 | 118 | </body> |
| 117 | 119 | </html> | ... | ... |
builder.xml
| ... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 | <property name="project.conf" value="conf" /> |
| 36 | 36 | |
| 37 | 37 | <!-- Nome del progetto a cui sono legati i file di configurazione - FIXME --> |
| 38 | - <property name="application.name" value="appbike" /> | |
| 38 | + <property name="application.name" value="fproxy" /> | |
| 39 | 39 | |
| 40 | 40 | <!-- Nome base del file war a cui saranno concatenati versione e release --> |
| 41 | 41 | <property name="project.warfile" value="${application.name}" /> |
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | |
| 245 | 245 | <fileset dir="${project.conf}/${installation}/"> |
| 246 | 246 | <include name="META-INF/context.xml"/> |
| 247 | - <include name="image-pack/**"/> | |
| 247 | + <!-- <include name="image-pack/**"/> --> | |
| 248 | 248 | <!-- <include name="config.local/version.txt"/> --> |
| 249 | 249 | </fileset> |
| 250 | 250 | |
| ... | ... | @@ -253,6 +253,7 @@ |
| 253 | 253 | <lib dir="${project.lib}/common" > |
| 254 | 254 | <exclude name="indexer/**"/> |
| 255 | 255 | <exclude name="analyzer**"/> |
| 256 | + <exclude name="local/**"/> | |
| 256 | 257 | </lib> |
| 257 | 258 | <!-- COMMON - LOCAL --> |
| 258 | 259 | <lib dir="${project.lib}/common/local" > | ... | ... |
conf/liliana/develop/META-INF/context.xml renamed to conf/ADT/test-liliana/META-INF/context.xml
| 1 | 1 | <?xml version='1.0' encoding='utf-8'?> |
| 2 | -<Context antiJARLocking="true" | |
| 2 | +<Context antiJARLocking="true" | |
| 3 | 3 | antiResourceLocking="false" |
| 4 | 4 | distributable="true" |
| 5 | 5 | reloadable="false" crossContext="false"> |
| 6 | + | |
| 6 | 7 | |
| 7 | 8 | <!-- Default set of monitored resources --> |
| 8 | - <WatchedResource>WEB-INF/web.xml</WatchedResource> | |
| 9 | + <WatchedResource>WEB-INF/web.xml</WatchedResource> | |
| 9 | 10 | |
| 10 | 11 | <!-- Uncomment this to disable session persistence across Tomcat restarts --> |
| 11 | - <Manager pathname="" /> | |
| 12 | - | |
| 13 | - <!-- SVILUPPO --> | |
| 14 | - <!-- DATASOURCE --> | |
| 15 | - <Resource name="jdbc/dm-stage" | |
| 16 | - auth="Container" | |
| 17 | - description="DB Connection" | |
| 18 | - driverClass="com.mysql.jdbc.Driver" | |
| 19 | - | |
| 20 | - initialPoolSize="1" | |
| 21 | - minPoolSize="1" | |
| 22 | - maxPoolSize="10" | |
| 23 | - acquireIncrement="1" | |
| 24 | - | |
| 25 | - checkoutTimeout="3600" | |
| 26 | - breakAfterAcquireFailure="false" | |
| 27 | - maxIdleTimeExcessConnections = "30" | |
| 28 | - maxIdleTime = "1800" | |
| 29 | - maxConnectionAge="3600" | |
| 30 | - idleConnectionTestPeriod="200" | |
| 31 | - | |
| 32 | - user="web103u1" | |
| 33 | - password="98c7EwXJS7" | |
| 34 | - factory="org.apache.naming.factory.BeanFactory" | |
| 35 | - type="com.mchange.v2.c3p0.ComboPooledDataSource" | |
| 36 | - jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web103db1?autoReconnect=true&characterEncoding=UTF-8" /> | |
| 37 | - | |
| 38 | - <Resource name="jdbc/dm-master" | |
| 12 | + <Manager pathname="" /> | |
| 13 | + | |
| 14 | + | |
| 15 | + <!-- SVILUPPO - ADT --> | |
| 16 | + <Resource name="jdbc/mwm_app" | |
| 39 | 17 | auth="Container" |
| 40 | 18 | description="DB Connection" |
| 41 | 19 | driverClass="com.mysql.jdbc.Driver" |
| 42 | 20 | |
| 43 | - initialPoolSize="1" | |
| 44 | - minPoolSize="0" | |
| 21 | + initialPoolSize="2" | |
| 22 | + minPoolSize="2" | |
| 45 | 23 | maxPoolSize="10" |
| 46 | - acquireIncrement="1" | |
| 24 | + acquireIncrement="2" | |
| 47 | 25 | |
| 48 | 26 | checkoutTimeout="3600" |
| 49 | 27 | breakAfterAcquireFailure="false" |
| ... | ... | @@ -52,11 +30,13 @@ |
| 52 | 30 | maxConnectionAge="3600" |
| 53 | 31 | idleConnectionTestPeriod="200" |
| 54 | 32 | |
| 55 | - user="web103u2" | |
| 56 | - password="GOoRoTj5K5" | |
| 57 | - factory="org.apache.naming.factory.BeanFactory" | |
| 58 | - type="com.mchange.v2.c3p0.ComboPooledDataSource" | |
| 59 | - jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web103db2?autoReconnect=true&characterEncoding=UTF-8" /> | |
| 60 | - | |
| 61 | - | |
| 62 | -</Context> | |
| 63 | 33 | \ No newline at end of file |
| 34 | + user="web144u2" | |
| 35 | + password="fdte5532" | |
| 36 | + factory="org.apache.naming.factory.BeanFactory" | |
| 37 | + type="com.mchange.v2.c3p0.ComboPooledDataSource" | |
| 38 | + jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web144db2?autoReconnect=true&characterEncoding=UTF-8" /> | |
| 39 | + | |
| 40 | +</Context> | |
| 41 | + | |
| 42 | + | |
| 43 | + | ... | ... |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 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.0 (6) - ADT/test-liliana [25/06/2014 14:56]</display-name> | |
| 4 | + <!-- Ultime modifiche del 23/06/2014 --> | |
| 5 | + | |
| 6 | + <!-- Configurazione per New Relic --> | |
| 7 | + <context-param> | |
| 8 | + <param-name>com.newrelic.agent.APPLICATION_NAME</param-name> | |
| 9 | + <param-value>FileProxyServer ADT (test)</param-value> | |
| 10 | + </context-param> | |
| 11 | + | |
| 12 | + <!-- ADT/test-liliana - 25/06/2014 14:56 --> | |
| 13 | + <!-- Configurazioni obbligatorie --> | |
| 14 | + <context-param> | |
| 15 | + <param-name>ErrorPage</param-name> | |
| 16 | + <param-value>/error.jsp</param-value> | |
| 17 | + </context-param> | |
| 18 | + <context-param> | |
| 19 | + <param-name>constantsFile</param-name> | |
| 20 | + <param-value>portal_settings.xml</param-value> | |
| 21 | + </context-param> | |
| 22 | + <context-param> | |
| 23 | + <param-name>logPropertyFile</param-name> | |
| 24 | + <param-value>log4j.xml</param-value> | |
| 25 | + </context-param> | |
| 26 | + | |
| 27 | + <context-param> | |
| 28 | + <param-name>defaultLanguage</param-name> | |
| 29 | + <param-value>it</param-value> | |
| 30 | + </context-param> | |
| 31 | + | |
| 32 | + <!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio --> | |
| 33 | + <context-param> | |
| 34 | + <param-name>SessionFactory</param-name> | |
| 35 | + <param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value> | |
| 36 | + </context-param> | |
| 37 | + | |
| 38 | + <!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio --> | |
| 39 | + <context-param> | |
| 40 | + <param-name>SecurityManager</param-name> | |
| 41 | + <param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value> | |
| 42 | + </context-param> | |
| 43 | + | |
| 44 | + <!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi --> | |
| 45 | + <context-param> | |
| 46 | + <param-name>accessLogWhat</param-name> | |
| 47 | + <param-value>,*,</param-value> | |
| 48 | + </context-param> | |
| 49 | + | |
| 50 | + <!-- @deprecated - Configurazioni opzionali --> | |
| 51 | + <context-param> | |
| 52 | + <param-name>mailServer</param-name> | |
| 53 | + <param-value>localhost</param-value> | |
| 54 | + </context-param> | |
| 55 | + | |
| 56 | + <!-- Da valorizzare se si vuole la autenticazione JWebber --> | |
| 57 | + <context-param> | |
| 58 | + <param-name>keyStore</param-name> | |
| 59 | + <param-value>it.softecspa.portal.security.KeyStoreImpl</param-value> | |
| 60 | + </context-param> | |
| 61 | + | |
| 62 | + <!-- Servlet --> | |
| 63 | + | |
| 64 | + <!-- Startup --> | |
| 65 | + <servlet> | |
| 66 | + <servlet-name>WebApp</servlet-name> | |
| 67 | + <servlet-class>it.softecspa.portal.InitWebApp</servlet-class> | |
| 68 | + <load-on-startup>1</load-on-startup> | |
| 69 | + </servlet> | |
| 70 | + <servlet-mapping> | |
| 71 | + <servlet-name>WebApp</servlet-name> | |
| 72 | + <url-pattern>/WebApp</url-pattern> | |
| 73 | + </servlet-mapping> | |
| 74 | + | |
| 75 | + | |
| 76 | + <!-- POST-SERVICE - servlet --> | |
| 77 | + <servlet> | |
| 78 | + <description>Servlet http file proxy</description> | |
| 79 | + <display-name>httpFileProxy-Statement Servlet</display-name> | |
| 80 | + <servlet-name>httpFileProxyServlet</servlet-name> | |
| 81 | + <servlet-class>it.softecspa.fileproxy.proxyservices.HttpFileProxyService</servlet-class> | |
| 82 | + </servlet> | |
| 83 | + <servlet-mapping> | |
| 84 | + <servlet-name>httpFileProxyServlet</servlet-name> | |
| 85 | + <url-pattern>/proxy-services/statement</url-pattern> | |
| 86 | + </servlet-mapping> | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + <!-- MONITOR - servlet --> | |
| 91 | + <servlet> | |
| 92 | + <description>Servlet di monitoraggio standard</description> | |
| 93 | + <display-name>Monitor Servlet</display-name> | |
| 94 | + <servlet-name>Monitor</servlet-name> | |
| 95 | + <servlet-class>it.softecspa.portal.Monitor</servlet-class> | |
| 96 | + </servlet> | |
| 97 | + <servlet-mapping> | |
| 98 | + <servlet-name>Monitor</servlet-name> | |
| 99 | + <url-pattern>/monitor</url-pattern> | |
| 100 | + </servlet-mapping> | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + <session-config> | |
| 105 | + <!-- Sono Minuti --> | |
| 106 | + <session-timeout>15</session-timeout> | |
| 107 | + </session-config> | |
| 108 | + | |
| 109 | + <mime-mapping> | |
| 110 | + <extension>html</extension> | |
| 111 | + <mime-type>text/html</mime-type> | |
| 112 | + </mime-mapping> | |
| 113 | + | |
| 114 | + <mime-mapping> | |
| 115 | + <extension>dtd</extension> | |
| 116 | + <mime-type>text/plain</mime-type> | |
| 117 | + </mime-mapping> | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + <welcome-file-list> | |
| 126 | + <welcome-file>index.html</welcome-file> | |
| 127 | + <welcome-file>index.htm</welcome-file> | |
| 128 | + <welcome-file>index.jsp</welcome-file> | |
| 129 | + <welcome-file>default.html</welcome-file> | |
| 130 | + <welcome-file>default.htm</welcome-file> | |
| 131 | + <welcome-file>default.jsp</welcome-file> | |
| 132 | + </welcome-file-list> | |
| 133 | +</web-app> | ... | ... |
conf/liliana/staging/conf/log4j.xml renamed to conf/ADT/test-liliana/conf/log4j.xml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | |
| 6 | 6 | <!-- APPLICATION LOG --> |
| 7 | 7 | <appender name="rootFile" class="it.softecspa.kahuna.log.DatedFileAppender"> |
| 8 | - <param name="Directory" value="/var/www/web124/log/ROOT" /> | |
| 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 | 11 | <param name="Autoflush" value="15" /> |
| ... | ... | @@ -15,45 +15,13 @@ |
| 15 | 15 | </layout> |
| 16 | 16 | </appender> |
| 17 | 17 | |
| 18 | - <!-- RELOAD LOG --> | |
| 19 | - <appender name="reloadFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 20 | - <param name="Directory" value="/var/www/web124/log/ROOT/reload" /> | |
| 21 | - <param name="Prefix" value="${hostname}_node." /> | |
| 22 | - <param name="Suffix" value=".log" /> | |
| 23 | - <param name="Autoflush" value="15" /> | |
| 24 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 25 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 26 | - </layout> | |
| 27 | - </appender> | |
| 28 | - | |
| 29 | - <!-- STATS LOG --> | |
| 30 | - <appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 31 | - <param name="Directory" value="/var/www/web124/log/ROOT/pool" /> | |
| 32 | - <param name="Prefix" value="${hostname}_c3p0." /> | |
| 33 | - <param name="Suffix" value=".log" /> | |
| 34 | - <param name="Autoflush" value="15" /> | |
| 35 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 36 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 37 | - </layout> | |
| 38 | - </appender> | |
| 39 | - | |
| 40 | - <!-- DRAFT DATA STATS LOG --> | |
| 41 | - <appender name="draftDataFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 42 | - <param name="Directory" value="/var/www/web124/log/ROOT/draft" /> | |
| 43 | - <param name="Prefix" value="${hostname}_draft." /> | |
| 44 | - <param name="Suffix" value=".log" /> | |
| 45 | - <param name="Autoflush" value="15" /> | |
| 46 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 47 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 48 | - </layout> | |
| 49 | - </appender> | |
| 50 | - | |
| 18 | + | |
| 51 | 19 | <!-- STATEMENTS STATISTICS LOG --> |
| 52 | 20 | <appender name="statementFile" class="it.softecspa.kahuna.log.DatedFileAppender"> |
| 53 | - <param name="Directory" value="/var/www/web124/log/ROOT/statement" /> | |
| 21 | + <param name="Directory" value="/var/www/web144/log/adt_test_proxy/statement" /> | |
| 54 | 22 | <param name="Prefix" value="${hostname}_statement." /> |
| 55 | 23 | <param name="Suffix" value=".log" /> |
| 56 | - <param name="Autoflush" value="30" /> | |
| 24 | + <param name="Autoflush" value="15" /> | |
| 57 | 25 | <layout class="org.apache.log4j.PatternLayout"> |
| 58 | 26 | <param name="ConversionPattern" value="%m%n" /> |
| 59 | 27 | </layout> |
| ... | ... | @@ -81,11 +49,6 @@ |
| 81 | 49 | <appender-ref ref="rootFile" /> |
| 82 | 50 | </category> |
| 83 | 51 | |
| 84 | - <!-- Log di gestione della librera DM SSO --> | |
| 85 | - <category name="it.softecspa.DMSSO" additivity="false"> | |
| 86 | - <priority value="TRACE" /> | |
| 87 | - <appender-ref ref="rootFile" /> | |
| 88 | - </category> | |
| 89 | 52 | |
| 90 | 53 | <!-- Logger utilizzato per il monitoraggio delle query SQL |
| 91 | 54 | Impostare a TRACE per visualizzare le query --> |
| ... | ... | @@ -129,16 +92,10 @@ |
| 129 | 92 | <!-- Monitoraggio del reload del contesto. |
| 130 | 93 | Utilizzato principalmente per monitore i riavvii dei nodi --> |
| 131 | 94 | <category name="reload" additivity="false"> |
| 132 | - <priority value="INFO" /> | |
| 95 | + <priority value="ERROR" /> | |
| 133 | 96 | <appender-ref ref="reloadFile" /> |
| 134 | 97 | </category> |
| 135 | 98 | |
| 136 | - <!-- Monitoraggio delle interrogazioni draft --> | |
| 137 | - <category name="draft.data" additivity="false"> | |
| 138 | - <priority value="INFO" /> | |
| 139 | - <appender-ref ref="draftDataFile" /> | |
| 140 | - </category> | |
| 141 | - | |
| 142 | 99 | <!-- ROOT --> |
| 143 | 100 | <root> |
| 144 | 101 | <priority value="ERROR"/> | ... | ... |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | +<properties> | |
| 4 | + <comment>Applicazione Http File Proxy 1.0 - sviluppo</comment> | |
| 5 | + | |
| 6 | + <!-- Mappatura DataSource, JWebber --> | |
| 7 | + <entry key="datasource.cms">jdbc/mwm_app#MYSQL</entry> | |
| 8 | + <!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> --> | |
| 9 | + | |
| 10 | + <!-- Mappatura DataSource, applicazione | |
| 11 | + in caso di più datasource separare la lista con la "virgola" --> | |
| 12 | + <entry key="datasource.application">jdbc/mwm_app#MYSQL</entry> | |
| 13 | + <!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry> --> | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + <!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat | |
| 18 | + Utilizzare la variabile ${hostname} --> | |
| 19 | + <entry key="cluster.mask">web144.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> | |
| 20 | + <entry key="cluster.backplane.mask">web144.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> | |
| 21 | + | |
| 22 | + <entry key="application.domain">mwm.dev.ctsapplications.it</entry> | |
| 23 | + <!-- Application context name, leave it blank if there isn't a context --> | |
| 24 | + <entry key="application.context.name">adt_fileproxy</entry> | |
| 25 | + | |
| 26 | + <entry key="application.http.port"></entry> <!-- leave it blank for default port 80 --> | |
| 27 | + <entry key="application.https.port"></entry> <!-- leave it blank for default port 443 --> | |
| 28 | + | |
| 29 | + <entry key="application.title">Http file proxy (ADT)</entry> | |
| 30 | + | |
| 31 | + <!-- NOTA: prefisso file di configurazione lingua e path immagini --> | |
| 32 | + <entry key="application.name">httpfileproxy</entry> | |
| 33 | + <entry key="application.environment">sviluppo</entry> | |
| 34 | + | |
| 35 | + <entry key="language.default">en</entry> | |
| 36 | + <entry key="base.url">http://mwm.dev.ctsapplications.it/adt_fileproxy</entry> | |
| 37 | + | |
| 38 | + <!-- Abilitazione del task, default true --> | |
| 39 | + <entry key="timertask.enable">false</entry> | |
| 40 | + | |
| 41 | + <!-- Server di posta e webmaster --> | |
| 42 | + <entry key="mail.enable">true</entry> | |
| 43 | + | |
| 44 | + <entry key="mail.smtp.host">smtp-out.softecspa.it</entry> | |
| 45 | + <entry key="mail.smtp.localhost"></entry> | |
| 46 | + <entry key="mail.smtp.user"></entry> | |
| 47 | + <entry key="mail.smtp.password"></entry> | |
| 48 | + | |
| 49 | + <entry key="mail.from">noreply@desktopmate.net</entry> | |
| 50 | + <entry key="mail.to">dm-admins@softecspa.it</entry> | |
| 51 | + <entry key="mail.cc"></entry> | |
| 52 | + <entry key="mail.bcc"></entry> | |
| 53 | + <entry key="mail.subject">File Proxy - ADT - liliana -</entry> | |
| 54 | + | |
| 55 | + <!-- Se 'true' invia una mail al riavvio del sistema | |
| 56 | + Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione --> | |
| 57 | + <entry key="mail.start.enable">false</entry> | |
| 58 | + | |
| 59 | + <!-- Invia una mail al verificarsi di un errore non gestito, default 'false' --> | |
| 60 | + <entry key="mail.error.enable">true</entry> | |
| 61 | + | |
| 62 | + <!-- Invia una mail al verificarsi di un errore SQL, default 'false' --> | |
| 63 | + <entry key="mail.sqlerror.enable">true</entry> | |
| 64 | + | |
| 65 | + | |
| 66 | + <!-- Valori che servono per criptare la password | |
| 67 | + Questo modulo è legato al databse della workflow --> | |
| 68 | + <entry key="chiaveCifraturaSimmetrica"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> | |
| 69 | + <entry key="chiaveCifraturaPassword"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> | |
| 70 | + <entry key="salt">&s@(dfghdgféè*a+$2lnd</entry> | |
| 71 | + <entry key="Base64">true</entry> | |
| 72 | + <entry key="DoubleMd5"></entry> | |
| 73 | + | |
| 74 | + | |
| 75 | + <entry key="POL_SA">SA</entry> | |
| 76 | + <entry key="POL_ADMIN">ADMIN</entry> | |
| 77 | + <entry key="POL_UP_DOWN">UP_DOWN</entry> | |
| 78 | + | |
| 79 | +</properties> | |
| 0 | 80 | \ No newline at end of file | ... | ... |
conf/liliana/develop/version.xml renamed to conf/ADT/test-liliana/version.xml
| ... | ... | @@ -3,10 +3,10 @@ |
| 3 | 3 | <properties> |
| 4 | 4 | <comment>Version information</comment> |
| 5 | 5 | |
| 6 | - <entry key="version.number">2.10.16</entry> | |
| 6 | + <entry key="version.number">1.0.0</entry> | |
| 7 | 7 | <entry key="version.release"></entry> |
| 8 | - <entry key="build.number">1814</entry> | |
| 9 | - <entry key="build.date">05/06/2014 11:39</entry> | |
| 10 | - <entry key="build.installation">liliana/develop</entry> | |
| 8 | + <entry key="build.number">6</entry> | |
| 9 | + <entry key="build.date">25/06/2014 14:56</entry> | |
| 10 | + <entry key="build.installation">ADT/test-liliana</entry> | |
| 11 | 11 | |
| 12 | 12 | </properties> | ... | ... |
conf/liliana/develop/WEB-INF/web.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 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>DesktopMate + Jarvis console 2.10.16 (1814) - liliana/develop [05/06/2014 11:39]</display-name> | |
| 4 | - <!-- Ultime modifiche del 18/02/2014 --> | |
| 5 | - | |
| 6 | - <!-- liliana/develop - 05/06/2014 11:39 --> | |
| 7 | - <!-- Configurazioni obbligatorie --> | |
| 8 | - <context-param> | |
| 9 | - <param-name>ErrorPage</param-name> | |
| 10 | - <param-value>/error.jsp</param-value> | |
| 11 | - </context-param> | |
| 12 | - <context-param> | |
| 13 | - <param-name>constantsFile</param-name> | |
| 14 | - <param-value>portal_settings.xml</param-value> | |
| 15 | - </context-param> | |
| 16 | - <context-param> | |
| 17 | - <param-name>logPropertyFile</param-name> | |
| 18 | - <param-value>log4j.xml</param-value> | |
| 19 | - </context-param> | |
| 20 | - | |
| 21 | - <context-param> | |
| 22 | - <param-name>defaultLanguage</param-name> | |
| 23 | - <param-value>it</param-value> | |
| 24 | - </context-param> | |
| 25 | - | |
| 26 | - <!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio --> | |
| 27 | - <context-param> | |
| 28 | - <param-name>SessionFactory</param-name> | |
| 29 | - <param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value> | |
| 30 | - </context-param> | |
| 31 | - | |
| 32 | - <!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio --> | |
| 33 | - <context-param> | |
| 34 | - <param-name>SecurityManager</param-name> | |
| 35 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value> | |
| 36 | - </context-param> | |
| 37 | - | |
| 38 | - <!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi --> | |
| 39 | - <context-param> | |
| 40 | - <param-name>accessLogWhat</param-name> | |
| 41 | - <param-value>,*,</param-value> | |
| 42 | - </context-param> | |
| 43 | - | |
| 44 | - <!-- @deprecated - Configurazioni opzionali --> | |
| 45 | - <context-param> | |
| 46 | - <param-name>mailServer</param-name> | |
| 47 | - <param-value>moon.softecspa.it</param-value> | |
| 48 | - </context-param> | |
| 49 | - | |
| 50 | - <!-- Da valorizzare se si vuole la autenticazione JWebber --> | |
| 51 | - <context-param> | |
| 52 | - <param-name>keyStore</param-name> | |
| 53 | - <param-value>it.softecspa.portal.security.KeyStoreImpl</param-value> | |
| 54 | - </context-param> | |
| 55 | - | |
| 56 | - | |
| 57 | - <!-- Daily report --> | |
| 58 | - <filter> | |
| 59 | - <filter-name>urlRewrite-DayReportFilter</filter-name> | |
| 60 | - <filter-class>it.softecspa.portal.filters.DayReportFilter</filter-class> | |
| 61 | - </filter> | |
| 62 | - <filter-mapping> | |
| 63 | - <filter-name>urlRewrite-DayReportFilter</filter-name> | |
| 64 | - <url-pattern>/dailyreport/*</url-pattern> | |
| 65 | - </filter-mapping> | |
| 66 | - | |
| 67 | - | |
| 68 | - <!-- DM Store --> | |
| 69 | - <filter> | |
| 70 | - <filter-name>urlRewrite-StoreFilter</filter-name> | |
| 71 | - <filter-class>it.softecspa.portal.filters.StoreFilter</filter-class> | |
| 72 | - </filter> | |
| 73 | - <filter-mapping> | |
| 74 | - <filter-name>urlRewrite-StoreFilter</filter-name> | |
| 75 | - <url-pattern>/store/*</url-pattern> | |
| 76 | - </filter-mapping> | |
| 77 | - | |
| 78 | - | |
| 79 | - <!-- DM Share --> | |
| 80 | - <filter> | |
| 81 | - <filter-name>urlRewrite-ShareFilter</filter-name> | |
| 82 | - <filter-class>it.softecspa.portal.filters.ShareFilter</filter-class> | |
| 83 | - </filter> | |
| 84 | - <filter-mapping> | |
| 85 | - <filter-name>urlRewrite-ShareFilter</filter-name> | |
| 86 | - <url-pattern>/share/*</url-pattern> | |
| 87 | - </filter-mapping> | |
| 88 | - | |
| 89 | - | |
| 90 | - | |
| 91 | - | |
| 92 | - <!-- Servlet --> | |
| 93 | - | |
| 94 | - | |
| 95 | - <!-- J.A.R.V.I.S - mark 2 --> | |
| 96 | - <servlet> | |
| 97 | - <servlet-name>Mark2</servlet-name> | |
| 98 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 99 | - <init-param> | |
| 100 | - <param-name>SecurityManager</param-name> | |
| 101 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 102 | - </init-param> | |
| 103 | - <init-param> | |
| 104 | - <param-name>servletCode</param-name> | |
| 105 | - <param-value>mark-II</param-value> | |
| 106 | - </init-param> | |
| 107 | - <init-param> | |
| 108 | - <param-name>ProcessRequest</param-name> | |
| 109 | - <param-value>it.softecspa.portal.processRequest.Mark2PR</param-value> | |
| 110 | - </init-param> | |
| 111 | - <init-param> | |
| 112 | - <param-name>ErrorJsp</param-name> | |
| 113 | - <param-value>/error.jsp</param-value> | |
| 114 | - </init-param> | |
| 115 | - </servlet> | |
| 116 | - | |
| 117 | - <servlet-mapping> | |
| 118 | - <servlet-name>Mark2</servlet-name> | |
| 119 | - <url-pattern>/jarvis</url-pattern> | |
| 120 | - </servlet-mapping> | |
| 121 | - | |
| 122 | - | |
| 123 | - <!-- J.A.R.V.I.S mark 1 --> | |
| 124 | - <servlet> | |
| 125 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 126 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 127 | - <init-param> | |
| 128 | - <param-name>SecurityManager</param-name> | |
| 129 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 130 | - </init-param> | |
| 131 | - <init-param> | |
| 132 | - <param-name>servletCode</param-name> | |
| 133 | - <param-value>backdoor-panel</param-value> | |
| 134 | - </init-param> | |
| 135 | - <init-param> | |
| 136 | - <param-name>ProcessRequest</param-name> | |
| 137 | - <param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value> | |
| 138 | - </init-param> | |
| 139 | - <init-param> | |
| 140 | - <param-name>ErrorJsp</param-name> | |
| 141 | - <param-value>/error.jsp</param-value> | |
| 142 | - </init-param> | |
| 143 | - </servlet> | |
| 144 | - | |
| 145 | - <servlet-mapping> | |
| 146 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 147 | - <url-pattern>/backdoor-panel</url-pattern> | |
| 148 | - </servlet-mapping> | |
| 149 | - | |
| 150 | - <servlet-mapping> | |
| 151 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 152 | - <url-pattern>/jarvis1</url-pattern> | |
| 153 | - </servlet-mapping> | |
| 154 | - | |
| 155 | - | |
| 156 | - <!-- Service Status --> | |
| 157 | - <servlet> | |
| 158 | - <servlet-name>ServicesStatus</servlet-name> | |
| 159 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 160 | - <init-param> | |
| 161 | - <param-name>SecurityManager</param-name> | |
| 162 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 163 | - </init-param> | |
| 164 | - <init-param> | |
| 165 | - <param-name>servletCode</param-name> | |
| 166 | - <param-value>services-status</param-value> | |
| 167 | - </init-param> | |
| 168 | - <init-param> | |
| 169 | - <param-name>ProcessRequest</param-name> | |
| 170 | - <param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value> | |
| 171 | - </init-param> | |
| 172 | - <init-param> | |
| 173 | - <param-name>ErrorJsp</param-name> | |
| 174 | - <param-value>/error.jsp</param-value> | |
| 175 | - </init-param> | |
| 176 | - </servlet> | |
| 177 | - <!-- Clone della servlet BackdoorPanel che necessita di SSO --> | |
| 178 | - <servlet-mapping> | |
| 179 | - <servlet-name>ServicesStatus</servlet-name> | |
| 180 | - <url-pattern>/services-status</url-pattern> | |
| 181 | - </servlet-mapping> | |
| 182 | - | |
| 183 | - | |
| 184 | - | |
| 185 | - <!-- Master Status --> | |
| 186 | - <servlet> | |
| 187 | - <servlet-name>MasterSlave</servlet-name> | |
| 188 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 189 | - <init-param> | |
| 190 | - <param-name>SecurityManager</param-name> | |
| 191 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 192 | - </init-param> | |
| 193 | - <init-param> | |
| 194 | - <param-name>servletCode</param-name> | |
| 195 | - <param-value>master-slave</param-value> | |
| 196 | - </init-param> | |
| 197 | - <init-param> | |
| 198 | - <param-name>ProcessRequest</param-name> | |
| 199 | - <param-value>it.softecspa.portal.processRequest.MasterSlavePR</param-value> | |
| 200 | - </init-param> | |
| 201 | - <init-param> | |
| 202 | - <param-name>ErrorJsp</param-name> | |
| 203 | - <param-value>/error.jsp</param-value> | |
| 204 | - </init-param> | |
| 205 | - </servlet> | |
| 206 | - <servlet-mapping> | |
| 207 | - <servlet-name>MasterSlave</servlet-name> | |
| 208 | - <url-pattern>/master-slave</url-pattern> | |
| 209 | - </servlet-mapping> | |
| 210 | - | |
| 211 | - | |
| 212 | - <!-- Service Synchro --> | |
| 213 | - <servlet> | |
| 214 | - <servlet-name>ServicesSynchro</servlet-name> | |
| 215 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 216 | - <init-param> | |
| 217 | - <param-name>SecurityManager</param-name> | |
| 218 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 219 | - </init-param> | |
| 220 | - <init-param> | |
| 221 | - <param-name>servletCode</param-name> | |
| 222 | - <param-value>services-synchro</param-value> | |
| 223 | - </init-param> | |
| 224 | - <init-param> | |
| 225 | - <param-name>ProcessRequest</param-name> | |
| 226 | - <param-value>it.softecspa.portal.processRequest.ServicesSynchroPR</param-value> | |
| 227 | - </init-param> | |
| 228 | - <init-param> | |
| 229 | - <param-name>ErrorJsp</param-name> | |
| 230 | - <param-value>/error.jsp</param-value> | |
| 231 | - </init-param> | |
| 232 | - </servlet> | |
| 233 | - <servlet-mapping> | |
| 234 | - <servlet-name>ServicesSynchro</servlet-name> | |
| 235 | - <url-pattern>/services-synchro</url-pattern> | |
| 236 | - </servlet-mapping> | |
| 237 | - | |
| 238 | - | |
| 239 | - <!-- @deprecated - Service Images --> | |
| 240 | - <servlet> | |
| 241 | - <servlet-name>ServicesImages</servlet-name> | |
| 242 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 243 | - <init-param> | |
| 244 | - <param-name>SecurityManager</param-name> | |
| 245 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 246 | - </init-param> | |
| 247 | - <init-param> | |
| 248 | - <param-name>servletCode</param-name> | |
| 249 | - <param-value>services-images</param-value> | |
| 250 | - </init-param> | |
| 251 | - <init-param> | |
| 252 | - <param-name>ProcessRequest</param-name> | |
| 253 | - <param-value>it.softecspa.portal.processRequest.ServicesImagesPR</param-value> | |
| 254 | - </init-param> | |
| 255 | - <init-param> | |
| 256 | - <param-name>ErrorJsp</param-name> | |
| 257 | - <param-value>/error.jsp</param-value> | |
| 258 | - </init-param> | |
| 259 | - </servlet> | |
| 260 | - <servlet-mapping> | |
| 261 | - <servlet-name>ServicesImages</servlet-name> | |
| 262 | - <url-pattern>/services-images</url-pattern> | |
| 263 | - </servlet-mapping> | |
| 264 | - | |
| 265 | - | |
| 266 | - <!-- Startup --> | |
| 267 | - <servlet> | |
| 268 | - <servlet-name>WebApp</servlet-name> | |
| 269 | - <servlet-class>it.softecspa.portal.InitWebApp</servlet-class> | |
| 270 | - <load-on-startup>1</load-on-startup> | |
| 271 | - </servlet> | |
| 272 | - <servlet-mapping> | |
| 273 | - <servlet-name>WebApp</servlet-name> | |
| 274 | - <url-pattern>/WebApp</url-pattern> | |
| 275 | - </servlet-mapping> | |
| 276 | - | |
| 277 | - | |
| 278 | - | |
| 279 | - <!-- DOWNLOAD-SERVICE - servlet --> | |
| 280 | - <servlet> | |
| 281 | - <description>Servlet utilizzata per la gestione dei downloade dello store</description> | |
| 282 | - <display-name>Store Service Servlet</display-name> | |
| 283 | - <servlet-name>StoreServiceServlet</servlet-name> | |
| 284 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 285 | - <init-param> | |
| 286 | - <param-name>SecurityManager</param-name> | |
| 287 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 288 | - </init-param> | |
| 289 | - <init-param> | |
| 290 | - <param-name>servletCode</param-name> | |
| 291 | - <param-value>store</param-value> | |
| 292 | - </init-param> | |
| 293 | - <init-param> | |
| 294 | - <param-name>ProcessRequest</param-name> | |
| 295 | - <param-value>it.softecspa.portal.processRequest.StorePR</param-value> | |
| 296 | - </init-param> | |
| 297 | - <init-param> | |
| 298 | - <param-name>ErrorJsp</param-name> | |
| 299 | - <param-value>/error.jsp</param-value> | |
| 300 | - </init-param> | |
| 301 | - <!-- | |
| 302 | - <servlet-class>it.softecspa.desktopmate.services.store.StoreServlet</servlet-class> | |
| 303 | - --> | |
| 304 | - </servlet> | |
| 305 | - <servlet-mapping> | |
| 306 | - <servlet-name>StoreServiceServlet</servlet-name> | |
| 307 | - <url-pattern>/store</url-pattern> | |
| 308 | - </servlet-mapping> | |
| 309 | - | |
| 310 | - | |
| 311 | - <!-- POST-SERVICE - servlet --> | |
| 312 | - <servlet> | |
| 313 | - <description>Servlet utilizzata per la comunicazione tra server e device</description> | |
| 314 | - <display-name>Device-Statement Servlet</display-name> | |
| 315 | - <servlet-name>DeviceStatementServlet</servlet-name> | |
| 316 | - <servlet-class>it.softecspa.desktopmate.deviceservices.DeviceStatement</servlet-class> | |
| 317 | - </servlet> | |
| 318 | - <servlet-mapping> | |
| 319 | - <servlet-name>DeviceStatementServlet</servlet-name> | |
| 320 | - <url-pattern>/services-post/statement</url-pattern> | |
| 321 | - </servlet-mapping> | |
| 322 | - | |
| 323 | - | |
| 324 | - <!-- NOTIFY REMOTE RENEWAL - servlet --> | |
| 325 | - <servlet> | |
| 326 | - <description>Servlet utilizzata per la notifica dei pagamenti eseguiti in remoto</description> | |
| 327 | - <display-name>Renewal Notification Servlet</display-name> | |
| 328 | - <servlet-name>NotifyRemoteRenewal</servlet-name> | |
| 329 | - <servlet-class>it.softecspa.desktopmate.otherservices.NotifyRemoteRenewal</servlet-class> | |
| 330 | - </servlet> | |
| 331 | - <servlet-mapping> | |
| 332 | - <servlet-name>NotifyRemoteRenewal</servlet-name> | |
| 333 | - <url-pattern>/notify</url-pattern> | |
| 334 | - </servlet-mapping> | |
| 335 | - | |
| 336 | - | |
| 337 | - <!-- Gestione servizi push - servlet --> | |
| 338 | - <servlet> | |
| 339 | - <description>Servlet utilizzata per la gestione remota dei serivzi push</description> | |
| 340 | - <display-name>Push-Statement Servlet</display-name> | |
| 341 | - <servlet-name>PushStatementServlet</servlet-name> | |
| 342 | - <servlet-class>it.softecspa.desktopmate.pushservices.PushStatement</servlet-class> | |
| 343 | - </servlet> | |
| 344 | - <servlet-mapping> | |
| 345 | - <servlet-name>PushStatementServlet</servlet-name> | |
| 346 | - <url-pattern>/services-push/statement</url-pattern> | |
| 347 | - </servlet-mapping> | |
| 348 | - | |
| 349 | - | |
| 350 | - <!-- Gestione servizi autorizzativi e di profilo - servlet --> | |
| 351 | - <servlet> | |
| 352 | - <description>Servlet utilizzata per la gestione dei servizi amministrativi</description> | |
| 353 | - <display-name>Auth-Statement Servlet</display-name> | |
| 354 | - <servlet-name>AuthStatementServlet</servlet-name> | |
| 355 | - <servlet-class>it.softecspa.desktopmate.authservices.AuthStatement</servlet-class> | |
| 356 | - </servlet> | |
| 357 | - <servlet-mapping> | |
| 358 | - <servlet-name>AuthStatementServlet</servlet-name> | |
| 359 | - <url-pattern>/authentication-service/statement</url-pattern> | |
| 360 | - </servlet-mapping> | |
| 361 | - | |
| 362 | - | |
| 363 | - <!-- Gestione servizi di esportazione - servlet --> | |
| 364 | - <servlet> | |
| 365 | - <description>Servlet utilizzata per la esportazione dei dati</description> | |
| 366 | - <display-name>Exporter-Statement Servlet</display-name> | |
| 367 | - <servlet-name>ExporterStatementServlet</servlet-name> | |
| 368 | - <servlet-class>it.softecspa.desktopmate.connectors.ExporterStatement</servlet-class> | |
| 369 | - </servlet> | |
| 370 | - <servlet-mapping> | |
| 371 | - <servlet-name>ExporterStatementServlet</servlet-name> | |
| 372 | - <url-pattern>/connector-export/statement</url-pattern> | |
| 373 | - </servlet-mapping> | |
| 374 | - | |
| 375 | - | |
| 376 | - <!-- Gestione servizi di portale con autenticazione - servlet --> | |
| 377 | - <servlet> | |
| 378 | - <description>Servlet di portale servizi con autenticazione</description> | |
| 379 | - <display-name>Portal-Statement (authenticated) Servlet</display-name> | |
| 380 | - <servlet-name>AuthPortalStatementServlet</servlet-name> | |
| 381 | - <servlet-class>it.softecspa.desktopmate.portalservices.auth.AuthenticatedStatement</servlet-class> | |
| 382 | - </servlet> | |
| 383 | - <servlet-mapping> | |
| 384 | - <servlet-name>AuthPortalStatementServlet</servlet-name> | |
| 385 | - <url-pattern>/portal-service/statement</url-pattern> | |
| 386 | - </servlet-mapping> | |
| 387 | - | |
| 388 | - | |
| 389 | - <!-- Gestione servizi di portale con guest - servlet --> | |
| 390 | - <servlet> | |
| 391 | - <description>Servlet di portale servizi</description> | |
| 392 | - <display-name>Portal-Statement (guest) Servlet</display-name> | |
| 393 | - <servlet-name>GuestPortalStatementServlet</servlet-name> | |
| 394 | - <servlet-class>it.softecspa.desktopmate.portalservices.guest.GuestStatement</servlet-class> | |
| 395 | - </servlet> | |
| 396 | - <servlet-mapping> | |
| 397 | - <servlet-name>GuestPortalStatementServlet</servlet-name> | |
| 398 | - <url-pattern>/portal-service-guest/statement</url-pattern> | |
| 399 | - </servlet-mapping> | |
| 400 | - | |
| 401 | - | |
| 402 | - <!-- Gestione servizi di interconnesione a MyDesktopmate - servlet --> | |
| 403 | - <servlet> | |
| 404 | - <description>Servlet collegamento con MyDesktopmate</description> | |
| 405 | - <display-name>MyDesktopmate-Statement Servlet</display-name> | |
| 406 | - <servlet-name>MyDesktopmateStatementServlet</servlet-name> | |
| 407 | - <servlet-class>it.softecspa.desktopmate.my.services.ConnectorStatement</servlet-class> | |
| 408 | - </servlet> | |
| 409 | - <servlet-mapping> | |
| 410 | - <servlet-name>MyDesktopmateStatementServlet</servlet-name> | |
| 411 | - <url-pattern>/mydesktopmate-service/statement</url-pattern> | |
| 412 | - </servlet-mapping> | |
| 413 | - | |
| 414 | - | |
| 415 | - <!-- Gestione servizi geoip - servlet | |
| 416 | - <servlet> | |
| 417 | - <description>Servlet servizi geoip</description> | |
| 418 | - <display-name>GeoIP-Statement Servlet</display-name> | |
| 419 | - <servlet-name>GeoipServiceServlet</servlet-name> | |
| 420 | - <servlet-class>it.softecspa.desktopmate.geoip.GeoIP</servlet-class> | |
| 421 | - </servlet> | |
| 422 | - <servlet-mapping> | |
| 423 | - <servlet-name>GeoipServiceServlet</servlet-name> | |
| 424 | - <url-pattern>/geoip/service</url-pattern> | |
| 425 | - </servlet-mapping> | |
| 426 | - --> | |
| 427 | - | |
| 428 | - <!-- MONITOR - servlet --> | |
| 429 | - <servlet> | |
| 430 | - <description>Servlet di monitoraggio standard</description> | |
| 431 | - <display-name>Monitor Servlet</display-name> | |
| 432 | - <servlet-name>Monitor</servlet-name> | |
| 433 | - <servlet-class>it.softecspa.portal.Monitor</servlet-class> | |
| 434 | - </servlet> | |
| 435 | - <servlet-mapping> | |
| 436 | - <servlet-name>Monitor</servlet-name> | |
| 437 | - <url-pattern>/monitor</url-pattern> | |
| 438 | - </servlet-mapping> | |
| 439 | - | |
| 440 | - | |
| 441 | - | |
| 442 | - <session-config> | |
| 443 | - <!-- Sono Minuti --> | |
| 444 | - <session-timeout>30</session-timeout> | |
| 445 | - </session-config> | |
| 446 | - | |
| 447 | - <mime-mapping> | |
| 448 | - <extension>html</extension> | |
| 449 | - <mime-type>text/html</mime-type> | |
| 450 | - </mime-mapping> | |
| 451 | - | |
| 452 | - <mime-mapping> | |
| 453 | - <extension>dtd</extension> | |
| 454 | - <mime-type>text/plain</mime-type> | |
| 455 | - </mime-mapping> | |
| 456 | - | |
| 457 | - | |
| 458 | - | |
| 459 | - | |
| 460 | - | |
| 461 | - | |
| 462 | - | |
| 463 | - <welcome-file-list> | |
| 464 | - <welcome-file>index.html</welcome-file> | |
| 465 | - <welcome-file>index.htm</welcome-file> | |
| 466 | - <welcome-file>index.jsp</welcome-file> | |
| 467 | - <welcome-file>default.html</welcome-file> | |
| 468 | - <welcome-file>default.htm</welcome-file> | |
| 469 | - <welcome-file>default.jsp</welcome-file> | |
| 470 | - </welcome-file-list> | |
| 471 | -</web-app> |
conf/liliana/develop/conf/log4j.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> | |
| 3 | -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> | |
| 4 | - | |
| 5 | - | |
| 6 | - <!-- APPLICATION LOG --> | |
| 7 | - <appender name="rootFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 8 | - <param name="Directory" value="/var/www/web103/log/ROOT" /> | |
| 9 | - <param name="Prefix" value="${hostname}_service." /> | |
| 10 | - <param name="Suffix" value=".log" /> | |
| 11 | - <param name="Autoflush" value="15" /> | |
| 12 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 13 | - <!-- <param name="ConversionPattern" value="%X{sessionId} - %d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> --> | |
| 14 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> | |
| 15 | - </layout> | |
| 16 | - </appender> | |
| 17 | - | |
| 18 | - <!-- RELOAD LOG --> | |
| 19 | - <appender name="reloadFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 20 | - <param name="Directory" value="/var/www/web103/log/ROOT/reload" /> | |
| 21 | - <param name="Prefix" value="${hostname}_node." /> | |
| 22 | - <param name="Suffix" value=".log" /> | |
| 23 | - <param name="Autoflush" value="90" /> | |
| 24 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 25 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 26 | - </layout> | |
| 27 | - </appender> | |
| 28 | - | |
| 29 | - <!-- STATS LOG --> | |
| 30 | - <appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 31 | - <param name="Directory" value="/var/www/web103/log/ROOT/pool" /> | |
| 32 | - <param name="Prefix" value="${hostname}_c3p0." /> | |
| 33 | - <param name="Suffix" value=".log" /> | |
| 34 | - <param name="Autoflush" value="15" /> | |
| 35 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 36 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 37 | - </layout> | |
| 38 | - </appender> | |
| 39 | - | |
| 40 | - <!-- DRAFT DATA STATS LOG --> | |
| 41 | - <appender name="draftDataFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 42 | - <param name="Directory" value="/var/www/web103/log/ROOT/draft" /> | |
| 43 | - <param name="Prefix" value="${hostname}_draft." /> | |
| 44 | - <param name="Suffix" value=".log" /> | |
| 45 | - <param name="Autoflush" value="15" /> | |
| 46 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 47 | - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" /> | |
| 48 | - </layout> | |
| 49 | - </appender> | |
| 50 | - | |
| 51 | - <!-- STATEMENTS STATISTICS LOG --> | |
| 52 | - <appender name="statementFile" class="it.softecspa.kahuna.log.DatedFileAppender"> | |
| 53 | - <param name="Directory" value="/var/www/web103/log/ROOT/statement" /> | |
| 54 | - <param name="Prefix" value="${hostname}_statement." /> | |
| 55 | - <param name="Suffix" value=".log" /> | |
| 56 | - <param name="Autoflush" value="30" /> | |
| 57 | - <layout class="org.apache.log4j.PatternLayout"> | |
| 58 | - <param name="ConversionPattern" value="%m%n" /> | |
| 59 | - </layout> | |
| 60 | - </appender> | |
| 61 | - | |
| 62 | - <!-- LOGGER SPECIFICI | |
| 63 | - <category name="access" additivity="false"> | |
| 64 | - <priority value="INFO" /> | |
| 65 | - <appender-ref ref="accessFile" /> | |
| 66 | - </category> --> | |
| 67 | - | |
| 68 | - <category name="application" additivity="false"> | |
| 69 | - <priority value="INFO" /> | |
| 70 | - <appender-ref ref="rootFile" /> | |
| 71 | - </category> | |
| 72 | - | |
| 73 | - <category name="it.softecspa" additivity="false"> | |
| 74 | - <priority value="DEBUG" /> | |
| 75 | - <appender-ref ref="rootFile" /> | |
| 76 | - </category> | |
| 77 | - | |
| 78 | - <!-- Log dei gestione della librera GQFramework --> | |
| 79 | - <category name="it.softecspa.database.gqframework" additivity="false"> | |
| 80 | - <priority value="ERROR" /> | |
| 81 | - <appender-ref ref="rootFile" /> | |
| 82 | - </category> | |
| 83 | - | |
| 84 | - <!-- Log di gestione della librera DM SSO --> | |
| 85 | - <category name="it.softecspa.DMSSO" additivity="false"> | |
| 86 | - <priority value="TRACE" /> | |
| 87 | - <appender-ref ref="rootFile" /> | |
| 88 | - </category> | |
| 89 | - | |
| 90 | - <!-- Logger utilizzato per il monitoraggio delle query SQL | |
| 91 | - Impostare a TRACE per visualizzare le query --> | |
| 92 | - <category name="it.softecspa.database.dbconnect.SQL" additivity="false"> | |
| 93 | - <priority value="TRACE" /> | |
| 94 | - <appender-ref ref="rootFile" /> | |
| 95 | - </category> | |
| 96 | - | |
| 97 | - <!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource | |
| 98 | - Impostare a INFO per tracciare le statistiche --> | |
| 99 | - <category name="it.softecspa.database.c3p0.stats" additivity="false"> | |
| 100 | - <priority value="OFF" /> | |
| 101 | - <appender-ref ref="c3p0StatsFile" /> | |
| 102 | - </category> | |
| 103 | - | |
| 104 | - <!-- Logger utilizzato per il monitoraggio delle chiamate | |
| 105 | - Impostare a INFO per tracciare le chiamate --> | |
| 106 | - <category name="it.softecspa.desktopmate.STATEMENT" additivity="false"> | |
| 107 | - <priority value="INFO" /> | |
| 108 | - <appender-ref ref="statementFile" /> | |
| 109 | - </category> | |
| 110 | - | |
| 111 | - <!-- Log da utilizzare nelle JSP --> | |
| 112 | - <category name="it.softecspa.JSP" additivity="false"> | |
| 113 | - <priority value="DEBUG" /> | |
| 114 | - <appender-ref ref="rootFile" /> | |
| 115 | - </category> | |
| 116 | - | |
| 117 | - <!-- Log per il servizio di posta | |
| 118 | - <category name="kahuna.mail" additivity="false"> | |
| 119 | - <priority value="DEBUG" /> | |
| 120 | - <appender-ref ref="rootFile" /> | |
| 121 | - </category> --> | |
| 122 | - | |
| 123 | - <!-- Log specifico del componente c3p0 per la gestione del connection pool --> | |
| 124 | - <category name="com.mchange" additivity="false"> | |
| 125 | - <priority value="INFO" /> | |
| 126 | - <appender-ref ref="rootFile" /> | |
| 127 | - </category> | |
| 128 | - | |
| 129 | - <!-- Monitoraggio del reload del contesto. | |
| 130 | - Utilizzato principalmente per monitore i riavvii dei nodi --> | |
| 131 | - <category name="reload" additivity="false"> | |
| 132 | - <priority value="INFO" /> | |
| 133 | - <appender-ref ref="reloadFile" /> | |
| 134 | - </category> | |
| 135 | - | |
| 136 | - <!-- Monitoraggio delle interrogazioni draft --> | |
| 137 | - <category name="draft.data" additivity="false"> | |
| 138 | - <priority value="INFO" /> | |
| 139 | - <appender-ref ref="draftDataFile" /> | |
| 140 | - </category> | |
| 141 | - | |
| 142 | - <!-- ROOT --> | |
| 143 | - <root> | |
| 144 | - <priority value="ERROR"/> | |
| 145 | - <appender-ref ref="rootFile"/> | |
| 146 | - </root> | |
| 147 | -</log4j:configuration> |
conf/liliana/develop/conf/portal_settings.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | -<properties> | |
| 4 | - <comment>Applicazione DesktopaMate 2.0 - sviluppo</comment> | |
| 5 | - | |
| 6 | - <!-- Mappatura DataSource, JWebber --> | |
| 7 | - <entry key="datasource.cms">jdbc/dm-stage#MYSQL</entry> | |
| 8 | - <!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> --> | |
| 9 | - | |
| 10 | - <!-- Mappatura DataSource, applicazione | |
| 11 | - in caso di più datasource separare la lista con la "virgola" --> | |
| 12 | - <entry key="datasource.application">jdbc/dm-master#MYSQL,jdbc/dm-stage#MYSQL</entry> | |
| 13 | - <!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry> --> | |
| 14 | - | |
| 15 | - <!-- NOTA | |
| 16 | - Il primo database in lista deve essere obbligatoriamente quello MASTER | |
| 17 | - Il secondo quello di STAGE. Sono obbligatori entrambi | |
| 18 | - | |
| 19 | - Nel caso sia specificato quello in sola lettura, valgono le stesse regole | |
| 20 | - --> | |
| 21 | - | |
| 22 | - <!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat | |
| 23 | - Utilizzare la varibile ${hostname} --> | |
| 24 | - <entry key="cluster.mask">web103.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> | |
| 25 | - <entry key="cluster.backplane.mask">web103.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> | |
| 26 | - | |
| 27 | - <entry key="jarvis.header.color">#F0DF25</entry> | |
| 28 | - | |
| 29 | - <entry key="application.domain">service.dev.desktopmate.net</entry> | |
| 30 | - <!-- Application context name, leave it blank if there isn't a context | |
| 31 | - <entry key="application.context.name"></entry> --> | |
| 32 | - | |
| 33 | - <!-- <entry key="application.http.port">80</entry> leave it blank for default port 80 --> | |
| 34 | - <!-- <entry key="application.https.port">8443</entry> leave it blank for default port 443 --> | |
| 35 | - | |
| 36 | - <!-- Time after that the page will be redirect | |
| 37 | - <entry key="TIME_REDIRECT_PAGE">4</entry> --> | |
| 38 | - | |
| 39 | - <entry key="application.title">DesktopMate</entry> | |
| 40 | - | |
| 41 | - <!-- NOTA: prefisso file di configurazione lingua e path immagini --> | |
| 42 | - <entry key="application.name">dmservice</entry> | |
| 43 | - <entry key="application.environment">sviluppo</entry> | |
| 44 | - | |
| 45 | - <entry key="language.default">en</entry> | |
| 46 | - <entry key="base.url">http://service.dev.desktopmate.net</entry> | |
| 47 | - | |
| 48 | - <!-- Autocensus username --> | |
| 49 | - <entry key="autocensus.login">true</entry> | |
| 50 | - <entry key="autocensus.profile">DOWNLOADER</entry> | |
| 51 | - | |
| 52 | - <!-- Configurazione propria dell'applicazione --> | |
| 53 | - <entry key="admin.policy.id">SA</entry> | |
| 54 | - | |
| 55 | - <!-- Formato della data in visualizzazione --> | |
| 56 | - <entry key="standard.datetime.format">dd/MM/yyyy HH:mm:ss</entry> | |
| 57 | - <entry key="standard.date.format">dd/MM/yyyy</entry> | |
| 58 | - | |
| 59 | - | |
| 60 | - <!-- Policies --> | |
| 61 | - <entry key="policy.SA">SA</entry> | |
| 62 | - <entry key="policy.ADMIN">ADMIN</entry> | |
| 63 | - | |
| 64 | - | |
| 65 | - <!-- Abilitazione del task, default true --> | |
| 66 | - <entry key="timertask.enable">false</entry> | |
| 67 | - | |
| 68 | - | |
| 69 | - <!-- Server di posta e webmaster --> | |
| 70 | - <entry key="mail.enable">true</entry> | |
| 71 | - | |
| 72 | - <!-- <entry key="mail.smtp.host">smtp-out.softecspa.it</entry> provvisorio --> | |
| 73 | - <entry key="mail.smtp.host">localhost</entry> | |
| 74 | - <entry key="mail.smtp.localhost"></entry> | |
| 75 | - <entry key="mail.smtp.user"></entry> | |
| 76 | - <entry key="mail.smtp.password"></entry> | |
| 77 | - | |
| 78 | - <entry key="mail.from">dm-web103-service.liliana@desktopmate.net</entry> | |
| 79 | - <entry key="mail.to">massimiliano.veroni@softecspa.it</entry> | |
| 80 | - <entry key="mail.cc"></entry> | |
| 81 | - <entry key="mail.bcc"></entry> | |
| 82 | - <entry key="mail.subject">DesktopMate - web103 - liliana -</entry> | |
| 83 | - | |
| 84 | - <!-- Se 'true' invia una mail al riavvio del sistema | |
| 85 | - Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione --> | |
| 86 | - <entry key="mail.start.enable">false</entry> | |
| 87 | - | |
| 88 | - <!-- Invia una mail al verificarsi di un errore non gestito, default 'false' --> | |
| 89 | - <entry key="mail.error.enable">true</entry> | |
| 90 | - | |
| 91 | - <!-- Invia una mail al verificarsi di un errore SQL, default 'false' --> | |
| 92 | - <entry key="mail.sqlerror.enable">true</entry> | |
| 93 | - | |
| 94 | - <!-- Invia una mail quando arriva un nuovo modello di device, default 'false' --> | |
| 95 | - <entry key="mail.new-device-model.enable">true</entry> | |
| 96 | - | |
| 97 | - <!-- Abilitazione sistema di recupero messaggi push non inviati al reload del contesto, default 'false' --> | |
| 98 | - <entry key="push.recovery.enable">false</entry> | |
| 99 | - | |
| 100 | - | |
| 101 | - <!-- Paginazione | |
| 102 | - <entry key="line4page">6</entry> | |
| 103 | - <entry key="max.segue">6</entry> | |
| 104 | - --> | |
| 105 | - | |
| 106 | -</properties> | |
| 107 | 0 | \ No newline at end of file |
conf/liliana/develop/conf/sso.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | -<properties> | |
| 4 | - <comment>Configurazione SSO DNA</comment> | |
| 5 | - | |
| 6 | - <entry key="cookie.enable">true</entry> | |
| 7 | - <!-- <entry key="cookie.domain">.dev.desktopmate.net</entry> --> | |
| 8 | - | |
| 9 | - <!-- Identificativi del client sul server SSO --> | |
| 10 | - <entry key="client.id">dmservice</entry> | |
| 11 | - <entry key="client.secret">d1906cca-d858-4420-ba54-f8c0984883bd</entry> | |
| 12 | - <entry key="default.scope">userinfo</entry> | |
| 13 | - <entry key="default.organization">SOFTEC</entry> | |
| 14 | - | |
| 15 | - <entry key="oauth2.server">http://dmsso.dev.desktopmate.net/dmsso</entry> | |
| 16 | - <entry key="oauth2.server.signature">9c5a523d-e3b1-4611-968b-c0e9207394fa:a9eaecee-387e-43ff-84ae-e2d77d3e4d1b</entry> | |
| 17 | - | |
| 18 | - <!-- Endpoint del serve SSO --> | |
| 19 | - <entry key="authorization.endpoint">${oauth2.server}/oauth2/authorize</entry> | |
| 20 | - <entry key="token.endpoint">${oauth2.server}/oauth2/token</entry> | |
| 21 | - <entry key="token.info.endpoint">${oauth2.server}/v1/tokeninfo</entry> | |
| 22 | - <entry key="user.info.endpoint">${oauth2.server}/v1/userinfo</entry> | |
| 23 | - <entry key="change.password.endpoint">${oauth2.server}/admin</entry> | |
| 24 | - <entry key="logout.endpoint">${oauth2.server}/logout</entry> | |
| 25 | - | |
| 26 | - <!-- Url di ritorno del server locale | |
| 27 | - <entry key="redirect.uri">http://service.dev.desktopmate.net/jarvis</entry> | |
| 28 | - <entry key="logout.uri">http://service.dev.desktopmate.net/jarvis?sso_status=LOGOUT</entry> | |
| 29 | - <entry key="error.uri">http://service.dev.desktopmate.net/jarvis?sso_status=ERROR</entry> | |
| 30 | - --> | |
| 31 | - <entry key="redirect.uri">${autourl}</entry> | |
| 32 | - <entry key="logout.uri">${autourl}?sso_status=LOGOUT</entry> | |
| 33 | - <entry key="error.uri">${autourl}?sso_status=ERROR</entry> | |
| 34 | - | |
| 35 | -</properties> | |
| 36 | 0 | \ No newline at end of file |
conf/liliana/develop/image-pack/apple-touch-icon-ipad-76x76.png deleted
6.22 KB
conf/liliana/develop/image-pack/apple-touch-icon-ipad-retina-152x152.png deleted
16.6 KB
conf/liliana/develop/image-pack/apple-touch-icon-iphone-60x60.png deleted
4.28 KB
conf/liliana/develop/image-pack/apple-touch-icon-iphone-retina-120x120.png deleted
12.1 KB
conf/liliana/develop/image-pack/background-image.png deleted
48.9 KB
conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-76x76.png deleted
7.12 KB
conf/liliana/develop/image-pack/store/apple-touch-icon-ipad-retina-152x152.png deleted
13 KB
conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-60x60.png deleted
6.03 KB
conf/liliana/develop/image-pack/store/apple-touch-icon-iphone-retina-120x120.png deleted
10.2 KB
conf/liliana/staging/META-INF/context.xml deleted
| 1 | -<?xml version='1.0' encoding='utf-8'?> | |
| 2 | -<Context antiJARLocking="true" | |
| 3 | - antiResourceLocking="false" | |
| 4 | - distributable="true" | |
| 5 | - reloadable="false" crossContext="false"> | |
| 6 | - | |
| 7 | - <!-- Default set of monitored resources --> | |
| 8 | - <WatchedResource>WEB-INF/web.xml</WatchedResource> | |
| 9 | - | |
| 10 | - <!-- Uncomment this to disable session persistence across Tomcat restarts --> | |
| 11 | - <Manager pathname="" /> | |
| 12 | - | |
| 13 | - <!-- SVILUPPO --> | |
| 14 | - <!-- DATASOURCE --> | |
| 15 | - <Resource name="jdbc/dm-stage" | |
| 16 | - auth="Container" | |
| 17 | - description="DB Connection" | |
| 18 | - driverClass="com.mysql.jdbc.Driver" | |
| 19 | - | |
| 20 | - initialPoolSize="1" | |
| 21 | - minPoolSize="1" | |
| 22 | - maxPoolSize="20" | |
| 23 | - acquireIncrement="1" | |
| 24 | - | |
| 25 | - checkoutTimeout="3600" | |
| 26 | - breakAfterAcquireFailure="false" | |
| 27 | - maxIdleTimeExcessConnections = "30" | |
| 28 | - maxIdleTime = "1800" | |
| 29 | - maxConnectionAge="3600" | |
| 30 | - idleConnectionTestPeriod="200" | |
| 31 | - | |
| 32 | - user="web124u1" | |
| 33 | - password="98c7EwXJS7" | |
| 34 | - factory="org.apache.naming.factory.BeanFactory" | |
| 35 | - type="com.mchange.v2.c3p0.ComboPooledDataSource" | |
| 36 | - jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web124db1?autoReconnect=true&characterEncoding=UTF-8" /> | |
| 37 | - | |
| 38 | - <Resource name="jdbc/dm-master" | |
| 39 | - auth="Container" | |
| 40 | - description="DB Connection" | |
| 41 | - driverClass="com.mysql.jdbc.Driver" | |
| 42 | - | |
| 43 | - initialPoolSize="1" | |
| 44 | - minPoolSize="0" | |
| 45 | - maxPoolSize="20" | |
| 46 | - acquireIncrement="1" | |
| 47 | - | |
| 48 | - checkoutTimeout="3600" | |
| 49 | - breakAfterAcquireFailure="false" | |
| 50 | - maxIdleTimeExcessConnections = "30" | |
| 51 | - maxIdleTime = "1800" | |
| 52 | - maxConnectionAge="3600" | |
| 53 | - idleConnectionTestPeriod="200" | |
| 54 | - | |
| 55 | - user="web124u2" | |
| 56 | - password="GOoRoTj5K5" | |
| 57 | - factory="org.apache.naming.factory.BeanFactory" | |
| 58 | - type="com.mchange.v2.c3p0.ComboPooledDataSource" | |
| 59 | - jdbcUrl="jdbc:mysql://int-mysql-master.cluster-liliana.softecspa.it:3306/web124db2?autoReconnect=true&characterEncoding=UTF-8" /> | |
| 60 | - | |
| 61 | - | |
| 62 | -</Context> | |
| 63 | 0 | \ No newline at end of file |
conf/liliana/staging/WEB-INF/web.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 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>DesktopMate + Jarvis console 2.10.18 (1820) - liliana/staging [13/06/2014 12:30]</display-name> | |
| 4 | - <!-- Ultime modifiche del 18/02/2014 --> | |
| 5 | - | |
| 6 | - <!-- liliana/staging - 13/06/2014 12:30 --> | |
| 7 | - <!-- Configurazioni obbligatorie --> | |
| 8 | - <context-param> | |
| 9 | - <param-name>ErrorPage</param-name> | |
| 10 | - <param-value>/error.jsp</param-value> | |
| 11 | - </context-param> | |
| 12 | - <context-param> | |
| 13 | - <param-name>constantsFile</param-name> | |
| 14 | - <param-value>portal_settings.xml</param-value> | |
| 15 | - </context-param> | |
| 16 | - <context-param> | |
| 17 | - <param-name>logPropertyFile</param-name> | |
| 18 | - <param-value>log4j.xml</param-value> | |
| 19 | - </context-param> | |
| 20 | - | |
| 21 | - <context-param> | |
| 22 | - <param-name>defaultLanguage</param-name> | |
| 23 | - <param-value>it</param-value> | |
| 24 | - </context-param> | |
| 25 | - | |
| 26 | - <!-- Utilizzata per la gestione della sessione - solo per funzioni di monitoraggio --> | |
| 27 | - <context-param> | |
| 28 | - <param-name>SessionFactory</param-name> | |
| 29 | - <param-value>it.softecspa.jwebber.frameworkImpl.session.CMSImplSessionFactory</param-value> | |
| 30 | - </context-param> | |
| 31 | - | |
| 32 | - <!-- Utilizzata per la gestione della sicurezza - solo per funzioni di monitoraggio --> | |
| 33 | - <context-param> | |
| 34 | - <param-name>SecurityManager</param-name> | |
| 35 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.CMSImplSecurityManager</param-value> | |
| 36 | - </context-param> | |
| 37 | - | |
| 38 | - <!-- @deprecated - Contiene l'elenco delle funzioni di cui deve essere fatto il log degli accessi --> | |
| 39 | - <context-param> | |
| 40 | - <param-name>accessLogWhat</param-name> | |
| 41 | - <param-value>,*,</param-value> | |
| 42 | - </context-param> | |
| 43 | - | |
| 44 | - <!-- @deprecated - Configurazioni opzionali --> | |
| 45 | - <context-param> | |
| 46 | - <param-name>mailServer</param-name> | |
| 47 | - <param-value>moon.softecspa.it</param-value> | |
| 48 | - </context-param> | |
| 49 | - | |
| 50 | - <!-- Da valorizzare se si vuole la autenticazione JWebber --> | |
| 51 | - <context-param> | |
| 52 | - <param-name>keyStore</param-name> | |
| 53 | - <param-value>it.softecspa.portal.security.KeyStoreImpl</param-value> | |
| 54 | - </context-param> | |
| 55 | - | |
| 56 | - | |
| 57 | - <!-- Daily report --> | |
| 58 | - <filter> | |
| 59 | - <filter-name>urlRewrite-DayReportFilter</filter-name> | |
| 60 | - <filter-class>it.softecspa.portal.filters.DayReportFilter</filter-class> | |
| 61 | - </filter> | |
| 62 | - <filter-mapping> | |
| 63 | - <filter-name>urlRewrite-DayReportFilter</filter-name> | |
| 64 | - <url-pattern>/dailyreport/*</url-pattern> | |
| 65 | - </filter-mapping> | |
| 66 | - | |
| 67 | - | |
| 68 | - <!-- DM Store --> | |
| 69 | - <filter> | |
| 70 | - <filter-name>urlRewrite-StoreFilter</filter-name> | |
| 71 | - <filter-class>it.softecspa.portal.filters.StoreFilter</filter-class> | |
| 72 | - </filter> | |
| 73 | - <filter-mapping> | |
| 74 | - <filter-name>urlRewrite-StoreFilter</filter-name> | |
| 75 | - <url-pattern>/store/*</url-pattern> | |
| 76 | - </filter-mapping> | |
| 77 | - | |
| 78 | - | |
| 79 | - <!-- DM Share --> | |
| 80 | - <filter> | |
| 81 | - <filter-name>urlRewrite-ShareFilter</filter-name> | |
| 82 | - <filter-class>it.softecspa.portal.filters.ShareFilter</filter-class> | |
| 83 | - </filter> | |
| 84 | - <filter-mapping> | |
| 85 | - <filter-name>urlRewrite-ShareFilter</filter-name> | |
| 86 | - <url-pattern>/share/*</url-pattern> | |
| 87 | - </filter-mapping> | |
| 88 | - | |
| 89 | - | |
| 90 | - | |
| 91 | - | |
| 92 | - <!-- Servlet --> | |
| 93 | - | |
| 94 | - | |
| 95 | - <!-- J.A.R.V.I.S - mark 2 --> | |
| 96 | - <servlet> | |
| 97 | - <servlet-name>Mark2</servlet-name> | |
| 98 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 99 | - <init-param> | |
| 100 | - <param-name>SecurityManager</param-name> | |
| 101 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 102 | - </init-param> | |
| 103 | - <init-param> | |
| 104 | - <param-name>servletCode</param-name> | |
| 105 | - <param-value>mark-II</param-value> | |
| 106 | - </init-param> | |
| 107 | - <init-param> | |
| 108 | - <param-name>ProcessRequest</param-name> | |
| 109 | - <param-value>it.softecspa.portal.processRequest.Mark2PR</param-value> | |
| 110 | - </init-param> | |
| 111 | - <init-param> | |
| 112 | - <param-name>ErrorJsp</param-name> | |
| 113 | - <param-value>/error.jsp</param-value> | |
| 114 | - </init-param> | |
| 115 | - </servlet> | |
| 116 | - | |
| 117 | - <servlet-mapping> | |
| 118 | - <servlet-name>Mark2</servlet-name> | |
| 119 | - <url-pattern>/jarvis</url-pattern> | |
| 120 | - </servlet-mapping> | |
| 121 | - | |
| 122 | - | |
| 123 | - <!-- J.A.R.V.I.S mark 1 --> | |
| 124 | - <servlet> | |
| 125 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 126 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 127 | - <init-param> | |
| 128 | - <param-name>SecurityManager</param-name> | |
| 129 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 130 | - </init-param> | |
| 131 | - <init-param> | |
| 132 | - <param-name>servletCode</param-name> | |
| 133 | - <param-value>backdoor-panel</param-value> | |
| 134 | - </init-param> | |
| 135 | - <init-param> | |
| 136 | - <param-name>ProcessRequest</param-name> | |
| 137 | - <param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value> | |
| 138 | - </init-param> | |
| 139 | - <init-param> | |
| 140 | - <param-name>ErrorJsp</param-name> | |
| 141 | - <param-value>/error.jsp</param-value> | |
| 142 | - </init-param> | |
| 143 | - </servlet> | |
| 144 | - | |
| 145 | - <servlet-mapping> | |
| 146 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 147 | - <url-pattern>/backdoor-panel</url-pattern> | |
| 148 | - </servlet-mapping> | |
| 149 | - | |
| 150 | - <servlet-mapping> | |
| 151 | - <servlet-name>BackdoorPanel</servlet-name> | |
| 152 | - <url-pattern>/jarvis1</url-pattern> | |
| 153 | - </servlet-mapping> | |
| 154 | - | |
| 155 | - | |
| 156 | - <!-- Service Status --> | |
| 157 | - <servlet> | |
| 158 | - <servlet-name>ServicesStatus</servlet-name> | |
| 159 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 160 | - <init-param> | |
| 161 | - <param-name>SecurityManager</param-name> | |
| 162 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 163 | - </init-param> | |
| 164 | - <init-param> | |
| 165 | - <param-name>servletCode</param-name> | |
| 166 | - <param-value>services-status</param-value> | |
| 167 | - </init-param> | |
| 168 | - <init-param> | |
| 169 | - <param-name>ProcessRequest</param-name> | |
| 170 | - <param-value>it.softecspa.portal.processRequest.BackdoorPR</param-value> | |
| 171 | - </init-param> | |
| 172 | - <init-param> | |
| 173 | - <param-name>ErrorJsp</param-name> | |
| 174 | - <param-value>/error.jsp</param-value> | |
| 175 | - </init-param> | |
| 176 | - </servlet> | |
| 177 | - <!-- Clone della servlet BackdoorPanel che necessita di SSO --> | |
| 178 | - <servlet-mapping> | |
| 179 | - <servlet-name>ServicesStatus</servlet-name> | |
| 180 | - <url-pattern>/services-status</url-pattern> | |
| 181 | - </servlet-mapping> | |
| 182 | - | |
| 183 | - | |
| 184 | - | |
| 185 | - <!-- Master Status --> | |
| 186 | - <servlet> | |
| 187 | - <servlet-name>MasterSlave</servlet-name> | |
| 188 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 189 | - <init-param> | |
| 190 | - <param-name>SecurityManager</param-name> | |
| 191 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 192 | - </init-param> | |
| 193 | - <init-param> | |
| 194 | - <param-name>servletCode</param-name> | |
| 195 | - <param-value>master-slave</param-value> | |
| 196 | - </init-param> | |
| 197 | - <init-param> | |
| 198 | - <param-name>ProcessRequest</param-name> | |
| 199 | - <param-value>it.softecspa.portal.processRequest.MasterSlavePR</param-value> | |
| 200 | - </init-param> | |
| 201 | - <init-param> | |
| 202 | - <param-name>ErrorJsp</param-name> | |
| 203 | - <param-value>/error.jsp</param-value> | |
| 204 | - </init-param> | |
| 205 | - </servlet> | |
| 206 | - <servlet-mapping> | |
| 207 | - <servlet-name>MasterSlave</servlet-name> | |
| 208 | - <url-pattern>/master-slave</url-pattern> | |
| 209 | - </servlet-mapping> | |
| 210 | - | |
| 211 | - | |
| 212 | - <!-- Service Synchro --> | |
| 213 | - <servlet> | |
| 214 | - <servlet-name>ServicesSynchro</servlet-name> | |
| 215 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 216 | - <init-param> | |
| 217 | - <param-name>SecurityManager</param-name> | |
| 218 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 219 | - </init-param> | |
| 220 | - <init-param> | |
| 221 | - <param-name>servletCode</param-name> | |
| 222 | - <param-value>services-synchro</param-value> | |
| 223 | - </init-param> | |
| 224 | - <init-param> | |
| 225 | - <param-name>ProcessRequest</param-name> | |
| 226 | - <param-value>it.softecspa.portal.processRequest.ServicesSynchroPR</param-value> | |
| 227 | - </init-param> | |
| 228 | - <init-param> | |
| 229 | - <param-name>ErrorJsp</param-name> | |
| 230 | - <param-value>/error.jsp</param-value> | |
| 231 | - </init-param> | |
| 232 | - </servlet> | |
| 233 | - <servlet-mapping> | |
| 234 | - <servlet-name>ServicesSynchro</servlet-name> | |
| 235 | - <url-pattern>/services-synchro</url-pattern> | |
| 236 | - </servlet-mapping> | |
| 237 | - | |
| 238 | - | |
| 239 | - <!-- @deprecated - Service Images --> | |
| 240 | - <servlet> | |
| 241 | - <servlet-name>ServicesImages</servlet-name> | |
| 242 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 243 | - <init-param> | |
| 244 | - <param-name>SecurityManager</param-name> | |
| 245 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.RequestSecurityManager</param-value> | |
| 246 | - </init-param> | |
| 247 | - <init-param> | |
| 248 | - <param-name>servletCode</param-name> | |
| 249 | - <param-value>services-images</param-value> | |
| 250 | - </init-param> | |
| 251 | - <init-param> | |
| 252 | - <param-name>ProcessRequest</param-name> | |
| 253 | - <param-value>it.softecspa.portal.processRequest.ServicesImagesPR</param-value> | |
| 254 | - </init-param> | |
| 255 | - <init-param> | |
| 256 | - <param-name>ErrorJsp</param-name> | |
| 257 | - <param-value>/error.jsp</param-value> | |
| 258 | - </init-param> | |
| 259 | - </servlet> | |
| 260 | - <servlet-mapping> | |
| 261 | - <servlet-name>ServicesImages</servlet-name> | |
| 262 | - <url-pattern>/services-images</url-pattern> | |
| 263 | - </servlet-mapping> | |
| 264 | - | |
| 265 | - | |
| 266 | - <!-- Startup --> | |
| 267 | - <servlet> | |
| 268 | - <servlet-name>WebApp</servlet-name> | |
| 269 | - <servlet-class>it.softecspa.portal.InitWebApp</servlet-class> | |
| 270 | - <load-on-startup>1</load-on-startup> | |
| 271 | - </servlet> | |
| 272 | - <servlet-mapping> | |
| 273 | - <servlet-name>WebApp</servlet-name> | |
| 274 | - <url-pattern>/WebApp</url-pattern> | |
| 275 | - </servlet-mapping> | |
| 276 | - | |
| 277 | - | |
| 278 | - | |
| 279 | - <!-- DOWNLOAD-SERVICE - servlet --> | |
| 280 | - <servlet> | |
| 281 | - <description>Servlet utilizzata per la gestione dei downloade dello store</description> | |
| 282 | - <display-name>Store Service Servlet</display-name> | |
| 283 | - <servlet-name>StoreServiceServlet</servlet-name> | |
| 284 | - <servlet-class>it.softecspa.mvc.MVCGenericServlet</servlet-class> | |
| 285 | - <init-param> | |
| 286 | - <param-name>SecurityManager</param-name> | |
| 287 | - <param-value>it.softecspa.jwebber.frameworkImpl.security.DMSsoSecurityManager</param-value> | |
| 288 | - </init-param> | |
| 289 | - <init-param> | |
| 290 | - <param-name>servletCode</param-name> | |
| 291 | - <param-value>store</param-value> | |
| 292 | - </init-param> | |
| 293 | - <init-param> | |
| 294 | - <param-name>ProcessRequest</param-name> | |
| 295 | - <param-value>it.softecspa.portal.processRequest.StorePR</param-value> | |
| 296 | - </init-param> | |
| 297 | - <init-param> | |
| 298 | - <param-name>ErrorJsp</param-name> | |
| 299 | - <param-value>/error.jsp</param-value> | |
| 300 | - </init-param> | |
| 301 | - <!-- | |
| 302 | - <servlet-class>it.softecspa.desktopmate.services.store.StoreServlet</servlet-class> | |
| 303 | - --> | |
| 304 | - </servlet> | |
| 305 | - <servlet-mapping> | |
| 306 | - <servlet-name>StoreServiceServlet</servlet-name> | |
| 307 | - <url-pattern>/store</url-pattern> | |
| 308 | - </servlet-mapping> | |
| 309 | - | |
| 310 | - | |
| 311 | - <!-- POST-SERVICE - servlet --> | |
| 312 | - <servlet> | |
| 313 | - <description>Servlet utilizzata per la comunicazione tra server e device</description> | |
| 314 | - <display-name>Device-Statement Servlet</display-name> | |
| 315 | - <servlet-name>DeviceStatementServlet</servlet-name> | |
| 316 | - <servlet-class>it.softecspa.desktopmate.deviceservices.DeviceStatement</servlet-class> | |
| 317 | - </servlet> | |
| 318 | - <servlet-mapping> | |
| 319 | - <servlet-name>DeviceStatementServlet</servlet-name> | |
| 320 | - <url-pattern>/services-post/statement</url-pattern> | |
| 321 | - </servlet-mapping> | |
| 322 | - | |
| 323 | - | |
| 324 | - <!-- NOTIFY REMOTE RENEWAL - servlet --> | |
| 325 | - <servlet> | |
| 326 | - <description>Servlet utilizzata per la notifica dei pagamenti eseguiti in remoto</description> | |
| 327 | - <display-name>Renewal Notification Servlet</display-name> | |
| 328 | - <servlet-name>NotifyRemoteRenewal</servlet-name> | |
| 329 | - <servlet-class>it.softecspa.desktopmate.otherservices.NotifyRemoteRenewal</servlet-class> | |
| 330 | - </servlet> | |
| 331 | - <servlet-mapping> | |
| 332 | - <servlet-name>NotifyRemoteRenewal</servlet-name> | |
| 333 | - <url-pattern>/notify</url-pattern> | |
| 334 | - </servlet-mapping> | |
| 335 | - | |
| 336 | - | |
| 337 | - <!-- Gestione servizi push - servlet --> | |
| 338 | - <servlet> | |
| 339 | - <description>Servlet utilizzata per la gestione remota dei serivzi push</description> | |
| 340 | - <display-name>Push-Statement Servlet</display-name> | |
| 341 | - <servlet-name>PushStatementServlet</servlet-name> | |
| 342 | - <servlet-class>it.softecspa.desktopmate.pushservices.PushStatement</servlet-class> | |
| 343 | - </servlet> | |
| 344 | - <servlet-mapping> | |
| 345 | - <servlet-name>PushStatementServlet</servlet-name> | |
| 346 | - <url-pattern>/services-push/statement</url-pattern> | |
| 347 | - </servlet-mapping> | |
| 348 | - | |
| 349 | - | |
| 350 | - <!-- Gestione servizi autorizzativi e di profilo - servlet --> | |
| 351 | - <servlet> | |
| 352 | - <description>Servlet utilizzata per la gestione dei servizi amministrativi</description> | |
| 353 | - <display-name>Auth-Statement Servlet</display-name> | |
| 354 | - <servlet-name>AuthStatementServlet</servlet-name> | |
| 355 | - <servlet-class>it.softecspa.desktopmate.authservices.AuthStatement</servlet-class> | |
| 356 | - </servlet> | |
| 357 | - <servlet-mapping> | |
| 358 | - <servlet-name>AuthStatementServlet</servlet-name> | |
| 359 | - <url-pattern>/authentication-service/statement</url-pattern> | |
| 360 | - </servlet-mapping> | |
| 361 | - | |
| 362 | - | |
| 363 | - <!-- Gestione servizi di esportazione - servlet --> | |
| 364 | - <servlet> | |
| 365 | - <description>Servlet utilizzata per la esportazione dei dati</description> | |
| 366 | - <display-name>Exporter-Statement Servlet</display-name> | |
| 367 | - <servlet-name>ExporterStatementServlet</servlet-name> | |
| 368 | - <servlet-class>it.softecspa.desktopmate.connectors.ExporterStatement</servlet-class> | |
| 369 | - </servlet> | |
| 370 | - <servlet-mapping> | |
| 371 | - <servlet-name>ExporterStatementServlet</servlet-name> | |
| 372 | - <url-pattern>/connector-export/statement</url-pattern> | |
| 373 | - </servlet-mapping> | |
| 374 | - | |
| 375 | - | |
| 376 | - <!-- Gestione servizi di portale con autenticazione - servlet --> | |
| 377 | - <servlet> | |
| 378 | - <description>Servlet di portale servizi con autenticazione</description> | |
| 379 | - <display-name>Portal-Statement (authenticated) Servlet</display-name> | |
| 380 | - <servlet-name>AuthPortalStatementServlet</servlet-name> | |
| 381 | - <servlet-class>it.softecspa.desktopmate.portalservices.auth.AuthenticatedStatement</servlet-class> | |
| 382 | - </servlet> | |
| 383 | - <servlet-mapping> | |
| 384 | - <servlet-name>AuthPortalStatementServlet</servlet-name> | |
| 385 | - <url-pattern>/portal-service/statement</url-pattern> | |
| 386 | - </servlet-mapping> | |
| 387 | - | |
| 388 | - | |
| 389 | - <!-- Gestione servizi di portale con guest - servlet --> | |
| 390 | - <servlet> | |
| 391 | - <description>Servlet di portale servizi</description> | |
| 392 | - <display-name>Portal-Statement (guest) Servlet</display-name> | |
| 393 | - <servlet-name>GuestPortalStatementServlet</servlet-name> | |
| 394 | - <servlet-class>it.softecspa.desktopmate.portalservices.guest.GuestStatement</servlet-class> | |
| 395 | - </servlet> | |
| 396 | - <servlet-mapping> | |
| 397 | - <servlet-name>GuestPortalStatementServlet</servlet-name> | |
| 398 | - <url-pattern>/portal-service-guest/statement</url-pattern> | |
| 399 | - </servlet-mapping> | |
| 400 | - | |
| 401 | - | |
| 402 | - <!-- Gestione servizi di interconnesione a MyDesktopmate - servlet --> | |
| 403 | - <servlet> | |
| 404 | - <description>Servlet collegamento con MyDesktopmate</description> | |
| 405 | - <display-name>MyDesktopmate-Statement Servlet</display-name> | |
| 406 | - <servlet-name>MyDesktopmateStatementServlet</servlet-name> | |
| 407 | - <servlet-class>it.softecspa.desktopmate.my.services.ConnectorStatement</servlet-class> | |
| 408 | - </servlet> | |
| 409 | - <servlet-mapping> | |
| 410 | - <servlet-name>MyDesktopmateStatementServlet</servlet-name> | |
| 411 | - <url-pattern>/mydesktopmate-service/statement</url-pattern> | |
| 412 | - </servlet-mapping> | |
| 413 | - | |
| 414 | - | |
| 415 | - <!-- Gestione servizi geoip - servlet | |
| 416 | - <servlet> | |
| 417 | - <description>Servlet servizi geoip</description> | |
| 418 | - <display-name>GeoIP-Statement Servlet</display-name> | |
| 419 | - <servlet-name>GeoipServiceServlet</servlet-name> | |
| 420 | - <servlet-class>it.softecspa.desktopmate.geoip.GeoIP</servlet-class> | |
| 421 | - </servlet> | |
| 422 | - <servlet-mapping> | |
| 423 | - <servlet-name>GeoipServiceServlet</servlet-name> | |
| 424 | - <url-pattern>/geoip/service</url-pattern> | |
| 425 | - </servlet-mapping> | |
| 426 | - --> | |
| 427 | - | |
| 428 | - <!-- MONITOR - servlet --> | |
| 429 | - <servlet> | |
| 430 | - <description>Servlet di monitoraggio standard</description> | |
| 431 | - <display-name>Monitor Servlet</display-name> | |
| 432 | - <servlet-name>Monitor</servlet-name> | |
| 433 | - <servlet-class>it.softecspa.portal.Monitor</servlet-class> | |
| 434 | - </servlet> | |
| 435 | - <servlet-mapping> | |
| 436 | - <servlet-name>Monitor</servlet-name> | |
| 437 | - <url-pattern>/monitor</url-pattern> | |
| 438 | - </servlet-mapping> | |
| 439 | - | |
| 440 | - | |
| 441 | - | |
| 442 | - <session-config> | |
| 443 | - <!-- Sono Minuti --> | |
| 444 | - <session-timeout>30</session-timeout> | |
| 445 | - </session-config> | |
| 446 | - | |
| 447 | - <mime-mapping> | |
| 448 | - <extension>html</extension> | |
| 449 | - <mime-type>text/html</mime-type> | |
| 450 | - </mime-mapping> | |
| 451 | - | |
| 452 | - <mime-mapping> | |
| 453 | - <extension>dtd</extension> | |
| 454 | - <mime-type>text/plain</mime-type> | |
| 455 | - </mime-mapping> | |
| 456 | - | |
| 457 | - | |
| 458 | - | |
| 459 | - | |
| 460 | - | |
| 461 | - | |
| 462 | - | |
| 463 | - <welcome-file-list> | |
| 464 | - <welcome-file>index.html</welcome-file> | |
| 465 | - <welcome-file>index.htm</welcome-file> | |
| 466 | - <welcome-file>index.jsp</welcome-file> | |
| 467 | - <welcome-file>default.html</welcome-file> | |
| 468 | - <welcome-file>default.htm</welcome-file> | |
| 469 | - <welcome-file>default.jsp</welcome-file> | |
| 470 | - </welcome-file-list> | |
| 471 | -</web-app> |
conf/liliana/staging/conf/portal_settings.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | -<properties> | |
| 4 | - <comment>Applicazione DesktopaMate 2.0 - staging</comment> | |
| 5 | - | |
| 6 | - <!-- Mappatura DataSource, JWebber --> | |
| 7 | - <entry key="datasource.cms">jdbc/dm-stage#MYSQL</entry> | |
| 8 | - <!-- <entry key="datasource.cms.readonly">jdbc/dm-master_readonly#MYSQL</entry> --> | |
| 9 | - | |
| 10 | - <!-- Mappatura DataSource, applicazione | |
| 11 | - in caso di più datasource separare la lista con la "virgola" --> | |
| 12 | - <entry key="datasource.application">jdbc/dm-master#MYSQL,jdbc/dm-stage#MYSQL</entry> | |
| 13 | - <!-- <entry key="datasource.application.readonly">jdbc/dm-master_readonly#MYSQL,jdbc/dm-stage_readonly#MYSQL</entry> --> | |
| 14 | - | |
| 15 | - <!-- NOTA | |
| 16 | - Il primo database in lista deve essere obbligatoriamente quello MASTER | |
| 17 | - Il secondo quello di STAGE. Sono obbligatori entrambi | |
| 18 | - | |
| 19 | - Nel caso sia specificato quello in sola lettura, valgono le stesse regole | |
| 20 | - --> | |
| 21 | - | |
| 22 | - <!-- Maschera di definizione del vero nome del cluster legato al virtual host Tomcat | |
| 23 | - Utilizzare la varibile ${hostname} --> | |
| 24 | - <entry key="cluster.mask">web124.${hostname}.cluster-liliana.aws.softecspa.it:8180</entry> | |
| 25 | - <entry key="cluster.backplane.mask">web124.${hostname}.cluster-liliana.aws.backplane.softecspa.it:8180</entry> | |
| 26 | - | |
| 27 | - <entry key="jarvis.header.color">#44F025</entry> | |
| 28 | - | |
| 29 | - <entry key="application.domain">stage-service.dev.desktopmate.net</entry> | |
| 30 | - <!-- Application context name, leave it blank if there isn't a context | |
| 31 | - <entry key="application.context.name"></entry> --> | |
| 32 | - | |
| 33 | - <!-- <entry key="application.http.port">80</entry> leave it blank for default port 80 --> | |
| 34 | - <!-- <entry key="application.https.port">8443</entry> leave it blank for default port 443 --> | |
| 35 | - | |
| 36 | - <!-- Time after that the page will be redirect | |
| 37 | - <entry key="TIME_REDIRECT_PAGE">4</entry> --> | |
| 38 | - | |
| 39 | - <entry key="application.title">DesktopMate (Staging version)</entry> | |
| 40 | - | |
| 41 | - <!-- NOTA: prefisso file di configurazione lingua e path immagini --> | |
| 42 | - <entry key="application.name">dmservice</entry> | |
| 43 | - <entry key="application.environment">staging</entry> | |
| 44 | - | |
| 45 | - <entry key="language.default">en</entry> | |
| 46 | - <entry key="base.url">http://stage-service.dev.desktopmate.net</entry> | |
| 47 | - | |
| 48 | - <!-- Autocensus username --> | |
| 49 | - <entry key="autocensus.login">true</entry> | |
| 50 | - <entry key="autocensus.profile">DOWNLOADER</entry> | |
| 51 | - | |
| 52 | - <!-- Configurazione propria dell'applicazione --> | |
| 53 | - <entry key="admin.policy.id">SA</entry> | |
| 54 | - | |
| 55 | - <!-- Formato della data in visualizzazione --> | |
| 56 | - <entry key="standard.datetime.format">dd/MM/yyyy HH:mm:ss</entry> | |
| 57 | - <entry key="standard.date.format">dd/MM/yyyy</entry> | |
| 58 | - | |
| 59 | - | |
| 60 | - <!-- Policies --> | |
| 61 | - <entry key="policy.SA">SA</entry> | |
| 62 | - <entry key="policy.ADMIN">ADMIN</entry> | |
| 63 | - | |
| 64 | - | |
| 65 | - | |
| 66 | - <!-- Server di posta e webmaster --> | |
| 67 | - <entry key="mail.enable">true</entry> | |
| 68 | - | |
| 69 | - <!-- <entry key="mail.smtp.host">smtp-out.softecspa.it</entry> provvisorio --> | |
| 70 | - <entry key="mail.smtp.host">localhost</entry> | |
| 71 | - <entry key="mail.smtp.localhost"></entry> | |
| 72 | - <entry key="mail.smtp.user"></entry> | |
| 73 | - <entry key="mail.smtp.password"></entry> | |
| 74 | - | |
| 75 | - <entry key="mail.from">dm-web124-service@desktopmate.net</entry> | |
| 76 | - <entry key="mail.to">massimiliano.veroni@softecspa.it</entry> | |
| 77 | - <entry key="mail.cc"></entry> | |
| 78 | - <entry key="mail.bcc"></entry> | |
| 79 | - <entry key="mail.subject">DesktopMate - web124 -</entry> | |
| 80 | - | |
| 81 | - <!-- Se 'true' invia una mail al riavvio del sistema | |
| 82 | - Se 'false' (default) la mail è inviata soltanto in caso di cambio di versione --> | |
| 83 | - <entry key="mail.start.enable">false</entry> | |
| 84 | - | |
| 85 | - <!-- Invia una mail al verificarsi di un errore non gestito, default 'false' --> | |
| 86 | - <entry key="mail.error.enable">true</entry> | |
| 87 | - | |
| 88 | - <!-- Invia una mail al verificarsi di un errore SQL, default 'false' --> | |
| 89 | - <entry key="mail.sqlerror.enable">true</entry> | |
| 90 | - | |
| 91 | - <!-- Invia una mail quando arriva un nuovo modello di device, default 'false' --> | |
| 92 | - <entry key="mail.new-device-model.enable">false</entry> | |
| 93 | - | |
| 94 | - <!-- Abilitazione sistema di recupero messaggi push non inviati al reload del contesto, default 'false' --> | |
| 95 | - <entry key="push.recovery.enable">true</entry> | |
| 96 | - | |
| 97 | - | |
| 98 | - | |
| 99 | - <!-- Paginazione | |
| 100 | - <entry key="line4page">6</entry> | |
| 101 | - <entry key="max.segue">6</entry> | |
| 102 | - --> | |
| 103 | - | |
| 104 | -</properties> | |
| 105 | 0 | \ No newline at end of file |
conf/liliana/staging/conf/sso.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | -<properties> | |
| 4 | - <comment>Configurazione SSO DNA</comment> | |
| 5 | - | |
| 6 | - <entry key="cookie.enable">true</entry> | |
| 7 | - <entry key="cookie.domain">dev.desktopmate.net</entry> | |
| 8 | - | |
| 9 | - <!-- Identificativi del client sul server SSO --> | |
| 10 | - <entry key="client.id">dmservice</entry> | |
| 11 | - <entry key="client.secret">d1906cca-d858-4420-ba54-f8c0984883bd</entry> | |
| 12 | - <entry key="default.scope">userinfo</entry> | |
| 13 | - <entry key="default.organization">SOFTEC</entry> | |
| 14 | - | |
| 15 | - <entry key="oauth2.server">http://dmsso.dev.desktopmate.net/dmsso</entry> | |
| 16 | - <entry key="oauth2.server.signature">9c5a523d-e3b1-4611-968b-c0e9207394fa:a9eaecee-387e-43ff-84ae-e2d77d3e4d1b</entry> | |
| 17 | - | |
| 18 | - <!-- Endpoint del serve SSO --> | |
| 19 | - <entry key="authorization.endpoint">${oauth2.server}/oauth2/authorize</entry> | |
| 20 | - <entry key="token.endpoint">${oauth2.server}/oauth2/token</entry> | |
| 21 | - <entry key="token.info.endpoint">${oauth2.server}/v1/tokeninfo</entry> | |
| 22 | - <entry key="user.info.endpoint">${oauth2.server}/v1/userinfo</entry> | |
| 23 | - <entry key="change.password.endpoint">${oauth2.server}/admin</entry> | |
| 24 | - <entry key="logout.endpoint">${oauth2.server}/logout</entry> | |
| 25 | - | |
| 26 | - <!-- Url di ritorno del server locale --> | |
| 27 | - <entry key="redirect.uri">http://stage-service.dev.desktopmate.net/jarvis</entry> | |
| 28 | - <entry key="logout.uri">http://stage-service.dev.desktopmate.net/jarvis?sso_status=LOGOUT</entry> | |
| 29 | - <entry key="error.uri">http://stage-service.dev.desktopmate.net/jarvis?sso_status=ERROR</entry> | |
| 30 | - | |
| 31 | -</properties> | |
| 32 | 0 | \ No newline at end of file |
conf/liliana/staging/image-pack/apple-touch-icon-ipad-76x76.png deleted
8.57 KB
conf/liliana/staging/image-pack/apple-touch-icon-ipad-retina-152x152.png deleted
24.4 KB
conf/liliana/staging/image-pack/apple-touch-icon-iphone-60x60.png deleted
5.99 KB
conf/liliana/staging/image-pack/apple-touch-icon-iphone-retina-120x120.png deleted
16.9 KB
conf/liliana/staging/image-pack/background-image.png deleted
41.7 KB
conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-76x76.png deleted
7.13 KB
conf/liliana/staging/image-pack/store/apple-touch-icon-ipad-retina-152x152.png deleted
13 KB
conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-60x60.png deleted
6.02 KB
conf/liliana/staging/image-pack/store/apple-touch-icon-iphone-retina-120x120.png deleted
10.2 KB
conf/liliana/staging/version.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | |
| 3 | -<properties> | |
| 4 | - <comment>Version information</comment> | |
| 5 | - | |
| 6 | - <entry key="version.number">2.10.18</entry> | |
| 7 | - <entry key="version.release"></entry> | |
| 8 | - <entry key="build.number">1820</entry> | |
| 9 | - <entry key="build.date">13/06/2014 12:30</entry> | |
| 10 | - <entry key="build.installation">liliana/staging</entry> | |
| 11 | - | |
| 12 | -</properties> |
conf/version.properties
packaging.xml
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<project basedir="." default="help" name="AppBike Server TRUNK"> | |
| 2 | +<project basedir="." default="help" name="HttpFileProxy - ADT - Deploy"> | |
| 3 | 3 | <!-- Build.xml - versione 2.0.0 --> |
| 4 | 4 | |
| 5 | 5 | |
| ... | ... | @@ -11,13 +11,6 @@ |
| 11 | 11 | |
| 12 | 12 | <target name="help"> |
| 13 | 13 | <echo>Help..</echo> |
| 14 | - <echo>* Reverse database STAGING: Crea le classi secondo lo standard dbConnect a partire dal database di STAGE (web124)</echo> | |
| 15 | - <echo>* Reverse database SVILUPPO: Crea le classi secondo lo standard dbConnect a partire dal database di SVILUPPO (web103)</echo> | |
| 16 | - <echo>
</echo> | |
| 17 | - <echo>* dist-PRODUCTION: Crea il file WAR per la distribuzione in PRODUZIONE sul contesto principale</echo> | |
| 18 | - <echo>* dist-liliana/STAGING: Crea il file WAR per la distribuzione in su STAGE</echo> | |
| 19 | - <echo>* dist-liliana/SVILUPPO: Crea il file WAR per la distribuzione in su SVILUPPO</echo> | |
| 20 | - <echo>
</echo> | |
| 21 | 14 | |
| 22 | 15 | |
| 23 | 16 | </target> |
| ... | ... | @@ -27,17 +20,17 @@ |
| 27 | 20 | |
| 28 | 21 | |
| 29 | 22 | <!-- Ambiente sviluppo --> |
| 30 | - <target name="dist - liliana/SVILUPPO (liliana/web103)" description="Costruzione del pacchetto per l'ambiente di test" depends="sub-include-AntContrib,sub-include-JSCH"> | |
| 23 | + <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"> | |
| 31 | 24 | |
| 32 | 25 | <antcallback antfile="${basedir}/mycredential.xml" target="credential.liliana" return="var.cert,var.usr,var.pwd,var.tomcat.usr,var.tomcat.pwd" /> |
| 33 | - <property name="var.web" value="web103" /> | |
| 34 | - <property name="var.ctx" value="ROOT" /> | |
| 26 | + <property name="var.web" value="web144" /> | |
| 27 | + <property name="var.ctx" value="adt_fileproxy" /> | |
| 35 | 28 | |
| 36 | 29 | <antcallback antfile="${basedir}/builder.xml" target="dist" return="project.dist,warfile.name"> |
| 37 | 30 | <!-- <param name="config.cliente" value=""/> --> |
| 38 | - <param name="config.prefix" value="liliana_dev_"/> | |
| 39 | - <param name="config.dir" value="liliana/develop"/> | |
| 40 | - <param name="new.relic" value="FileProxyServer ADT (production)"/> | |
| 31 | + <param name="config.prefix" value="adt_liliana_test_"/> | |
| 32 | + <param name="config.dir" value="ADT/test-liliana"/> | |
| 33 | + <param name="new.relic" value="FileProxyServer ADT (test)"/> | |
| 41 | 34 | </antcallback> |
| 42 | 35 | |
| 43 | 36 | <ant antfile="${basedir}/deployer-script.xml" inheritAll="false" target="uploadAndDeploy" > |
| ... | ... | @@ -72,7 +65,7 @@ |
| 72 | 65 | <!-- <param name="config.cliente" value=""/> --> |
| 73 | 66 | <param name="config.prefix" value="product_root_"/> |
| 74 | 67 | <param name="config.dir" value="desktopmate.net/ROOT"/> |
| 75 | - <param name="new.relic" value="FileProxyServer ADT (develop)"/> | |
| 68 | + <param name="new.relic" value="FileProxyServer ADT (production)"/> | |
| 76 | 69 | </antcallback> |
| 77 | 70 | |
| 78 | 71 | <ant antfile="${basedir}/deployer-script.xml" inheritAll="false" target="uploadAndDeploy" > |
| ... | ... | @@ -94,100 +87,7 @@ |
| 94 | 87 | |
| 95 | 88 | |
| 96 | 89 | |
| 97 | - <target name=">> Reverse database SVILUPPO (web350)" description="Reverse del database di stage"> | |
| 98 | - <antcall target="sub-reverseDatabase"> | |
| 99 | - <param name="param.target" value="SVILUPPO"/> | |
| 100 | - <param name="param.database" value="web350db1"/> | |
| 101 | - <param name="param.username" value="web350u1"/> | |
| 102 | - <param name="param.password" value="98c7EwXJS7"/> | |
| 103 | - </antcall> | |
| 104 | - </target> | |
| 105 | - | |
| 106 | - | |
| 107 | - <target name=">-- Switch to SVILUPPO (web350)" description="Cambia le configurazioni per lavorare su DEV"> | |
| 108 | - <antcall target="sub-switch"> | |
| 109 | - <param name="param.title" value="SVILUPPO (web350)"/> | |
| 110 | - <param name="param.source" value="context-liliana-web350db1.xml"/> | |
| 111 | - </antcall> | |
| 112 | - </target> | |
| 113 | - | |
| 114 | - | |
| 115 | 90 | |
| 116 | - <target name=">-- Switch to PROD (web??)" description="Cambia le configurazioni per lavorare su PRODUZIONE"> | |
| 117 | - <antcall target="sub-switch"> | |
| 118 | - <param name="param.title" value="PRODUZIONE (web??)"/> | |
| 119 | - <param name="param.source" value="context-root-PROD.xml"/> | |
| 120 | - </antcall> | |
| 121 | - </target> | |
| 122 | 91 | |
| 123 | - <target name="sub-switch"> | |
| 124 | - <echo>Switch context.xml to ${param.title}</echo> | |
| 125 | - <copy file="${basedir}/conf/myMETA-INF/${param.source}" tofile="${basedir}/WebContent/META-INF/context.xml" overwrite="true" verbose="false"/> | |
| 126 | - | |
| 127 | - <delete> | |
| 128 | - <fileset dir="${basedir}/WebContent/META-INF" includes="**.txt" excludes="."/> | |
| 129 | - </delete> | |
| 130 | - | |
| 131 | - | |
| 132 | - | |
| 133 | - <property name="myfile" value="${basedir}/WebContent/META-INF/${param.title}.txt" /> | |
| 134 | - <echo file="${myfile}" append="true">context.xml from ${basedir}/conf/myMETA-INF/${param.source}
</echo> | |
| 135 | - | |
| 136 | - <antcall target="refresh" /> | |
| 137 | - </target> | |
| 138 | - | |
| 139 | - | |
| 140 | - | |
| 141 | - <target name="sub-reverseDatabase"> | |
| 142 | - | |
| 143 | - <!-- Richiesta di conferma --> | |
| 144 | - <input message="Confermi la rigenerazione della struttura dati, database ${param.target}?" | |
| 145 | - validargs="S,n" | |
| 146 | - addproperty="input.response" | |
| 147 | - defaultvalue="S"/> | |
| 148 | - <condition property="do.abort"> | |
| 149 | - <not> | |
| 150 | - <equals arg1="S" arg2="${input.response}" /> | |
| 151 | - </not> | |
| 152 | - </condition> | |
| 153 | - <fail if="do.abort">Operazione annullata dall'utente</fail> | |
| 154 | - | |
| 155 | - | |
| 156 | - <taskdef name="reverser" classname="it.softecspa.database.reverser.ReverserAnt" > | |
| 157 | - <classpath > | |
| 158 | - <pathelement location="${basedir}/lib/common/local/dbConnect_1.7.1.jar"/> | |
| 159 | - <pathelement location="${basedir}/lib/common/local/kahuna5j_4.2.3.jar"/> | |
| 160 | - <pathelement location="${basedir}/lib/common/log4j-1.2.15.jar"/> | |
| 161 | - <pathelement location="${basedir}/lib/jdbc/mysql-connector-java-5.0.8-bin.jar"/> | |
| 162 | - </classpath> | |
| 163 | - </taskdef> | |
| 164 | - | |
| 165 | - <property name="exclude" value="(cms_.*)|(iso.*)" /> | |
| 166 | - <echo>Esclude rule: ${exclude}</echo> | |
| 167 | - | |
| 168 | - <!-- (master) | |
| 169 | - user="web103u2"98c7EwXJS7 | |
| 170 | - password="GOoRoTj5K5" | |
| 171 | - --> | |
| 172 | - <!-- DB SVILUPPO (stage) --> | |
| 173 | - <reverser description="Reverser" | |
| 174 | - driver="com.mysql.jdbc.Driver" | |
| 175 | - user="${param.username}" | |
| 176 | - password="${param.password}" | |
| 177 | - url="jdbc:mysql://localhost:3306/${param.database}?autoReconnect=true" | |
| 178 | - root="${basedir}/src" | |
| 179 | - package="it.softecspa.appbike.db" | |
| 180 | - exclude="${exclude}" | |
| 181 | - prefixlength="4" | |
| 182 | - deletewithcancel="true" | |
| 183 | - updaterecordtimestamp="true" | |
| 184 | - blockalonechar="true" | |
| 185 | - clonable="true" | |
| 186 | - /> | |
| 187 | - | |
| 188 | - | |
| 189 | - <antcall target="refresh" /> | |
| 190 | - | |
| 191 | - </target> | |
| 192 | 92 | |
| 193 | 93 | </project> |
| 194 | 94 | \ No newline at end of file | ... | ... |
src/conf/portal_settings.xml
| ... | ... | @@ -60,4 +60,18 @@ |
| 60 | 60 | <!-- Invia una mail al verificarsi di un errore non gestito, default 'false' --> |
| 61 | 61 | <entry key="mail.error.enable">false</entry> |
| 62 | 62 | |
| 63 | + | |
| 64 | + <!-- Valori che servono per criptare la password | |
| 65 | + Questo modulo è legato al databse della workflow --> | |
| 66 | + <entry key="chiaveCifraturaSimmetrica"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> | |
| 67 | + <entry key="chiaveCifraturaPassword"><![CDATA[|||||||||||RIDEFINIRE||||||||||||]]></entry> | |
| 68 | + <entry key="salt">&s@(dfghdgféè*a+$2lnd</entry> | |
| 69 | + <entry key="Base64">true</entry> | |
| 70 | + <entry key="DoubleMd5"></entry> | |
| 71 | + | |
| 72 | + | |
| 73 | + <entry key="POL_SA">SA</entry> | |
| 74 | + <entry key="POL_ADMIN">ADMIN</entry> | |
| 75 | + <entry key="POL_UP_DOWN">UP_DOWN</entry> | |
| 76 | + | |
| 63 | 77 | </properties> |
| 64 | 78 | \ No newline at end of file | ... | ... |
src/it/softecspa/fileproxy/proxyservices/core/GlobalHttpProxyRequest.java
| ... | ... | @@ -4,7 +4,13 @@ import it.softecspa.fileproxy.services.common.core.request.UniversalRequest; |
| 4 | 4 | |
| 5 | 5 | public interface GlobalHttpProxyRequest extends UniversalRequest { |
| 6 | 6 | |
| 7 | - | |
| 7 | + public String getUsername(); | |
| 8 | + | |
| 9 | + public void setUsername(String username); | |
| 10 | + | |
| 11 | + public String getPassword(); | |
| 12 | + | |
| 13 | + public void setPassword(String password); | |
| 8 | 14 | |
| 9 | 15 | |
| 10 | 16 | } | ... | ... |
src/it/softecspa/fileproxy/proxyservices/manager/AbstractHttpFileProxyManager.java
| 1 | 1 | package it.softecspa.fileproxy.proxyservices.manager; |
| 2 | 2 | |
| 3 | -import it.softecspa.fileproxy.proxyservices.manager.core.NullSession; | |
| 3 | +import it.softecspa.fileproxy.proxyservices.manager.core.WorkflowSession; | |
| 4 | 4 | import it.softecspa.fileproxy.proxyservices.request.AbstractHttpFileProxyRequest; |
| 5 | 5 | import it.softecspa.fileproxy.proxyservices.response.AbstractHttpFileProxyResponse; |
| 6 | 6 | import it.softecspa.fileproxy.services.ServerCacheFactory; |
| ... | ... | @@ -8,14 +8,9 @@ import it.softecspa.fileproxy.services.common.CheckerException; |
| 8 | 8 | import it.softecspa.fileproxy.services.common.ManagerException; |
| 9 | 9 | import it.softecspa.fileproxy.services.common.ResponseOutcome; |
| 10 | 10 | import it.softecspa.fileproxy.services.common.core.UniversalManager; |
| 11 | -import it.softecspa.kahuna.io.File; | |
| 12 | 11 | |
| 13 | 12 | |
| 14 | -public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFileProxyRequest, O extends AbstractHttpFileProxyResponse> extends UniversalManager <I,O,NullSession<I>> { | |
| 15 | - | |
| 16 | - | |
| 17 | - boolean logRequestInfo; | |
| 18 | - | |
| 13 | +public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFileProxyRequest, O extends AbstractHttpFileProxyResponse> extends UniversalManager <I,O,WorkflowSession<I>> { | |
| 19 | 14 | |
| 20 | 15 | |
| 21 | 16 | @Override |
| ... | ... | @@ -25,18 +20,14 @@ public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFilePro |
| 25 | 20 | |
| 26 | 21 | |
| 27 | 22 | @Override |
| 28 | - protected NullSession<I> buildAndValidateSession(ServerCacheFactory cacheInfo, boolean stageMode) throws CheckerException, ManagerException { | |
| 23 | + protected WorkflowSession<I> buildAndValidateSession(ServerCacheFactory cacheInfo, boolean stageMode) throws CheckerException, ManagerException { | |
| 29 | 24 | |
| 30 | - //try { | |
| 31 | - // Creo l'istanza dell'oggetto di sessione DM | |
| 32 | - session = new NullSession(cacheInfo, request, true, null); | |
| 33 | - | |
| 34 | - return session; | |
| 35 | - /* | |
| 36 | - } catch (SQLException e) { | |
| 37 | - throw new ManagerException(e); | |
| 38 | - } | |
| 39 | - */ | |
| 25 | + // Creo l'istanza dell'oggetto di sessione DM | |
| 26 | + session = new WorkflowSession<I>(cacheInfo, request, true, cmReadonly); | |
| 27 | + | |
| 28 | + session.validate(); | |
| 29 | + return session; | |
| 30 | + | |
| 40 | 31 | } |
| 41 | 32 | |
| 42 | 33 | /** |
| ... | ... | @@ -59,6 +50,7 @@ public abstract class AbstractHttpFileProxyManager<I extends AbstractHttpFilePro |
| 59 | 50 | return ServerCacheFactory.getInstance().getResourceRoot() + _path; |
| 60 | 51 | } |
| 61 | 52 | |
| 53 | + | |
| 62 | 54 | /** |
| 63 | 55 | * Controlla la presenza di caratteri speciali non accettati dai path |
| 64 | 56 | * @param da_controllare | ... | ... |
src/it/softecspa/fileproxy/proxyservices/manager/core/NullSession.java deleted
| 1 | -package it.softecspa.fileproxy.proxyservices.manager.core; | |
| 2 | - | |
| 3 | -import it.softecspa.database.dbconnect.ConnectionManager; | |
| 4 | -import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest; | |
| 5 | -import it.softecspa.fileproxy.services.ServerCacheFactory; | |
| 6 | -import it.softecspa.fileproxy.services.common.CheckerException; | |
| 7 | -import it.softecspa.fileproxy.services.common.core.UniversalSession; | |
| 8 | - | |
| 9 | -import java.sql.SQLException; | |
| 10 | - | |
| 11 | -public class NullSession<I extends GlobalHttpProxyRequest> extends UniversalSession<I> { | |
| 12 | - | |
| 13 | - | |
| 14 | - public NullSession(ServerCacheFactory cache, I request, boolean stage, ConnectionManager cmReadonly) { | |
| 15 | - super(cache, request, stage, cmReadonly); | |
| 16 | - } | |
| 17 | - | |
| 18 | - @Override | |
| 19 | - public void validate() throws CheckerException, SQLException { | |
| 20 | - | |
| 21 | - | |
| 22 | - } | |
| 23 | - | |
| 24 | - | |
| 25 | - | |
| 26 | - | |
| 27 | -} |
src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
0 → 100644
| 1 | +package it.softecspa.fileproxy.proxyservices.manager.core; | |
| 2 | + | |
| 3 | +import it.softecspa.database.dbconnect.ConnectionManager; | |
| 4 | +import it.softecspa.database.dbconnect.DatabaseStatementUnplugged; | |
| 5 | +import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest; | |
| 6 | +import it.softecspa.fileproxy.services.ServerCacheFactory; | |
| 7 | +import it.softecspa.fileproxy.services.common.CheckerException; | |
| 8 | +import it.softecspa.fileproxy.services.common.ManagerException; | |
| 9 | +import it.softecspa.fileproxy.services.common.ResponseOutcome; | |
| 10 | +import it.softecspa.fileproxy.services.common.core.UniversalSession; | |
| 11 | +import it.softecspa.jwebber.bo.Utente; | |
| 12 | +import it.softecspa.kahuna.lang.XString; | |
| 13 | +import it.softecspa.mvc.exceptions.AuthenticationException; | |
| 14 | +import it.softecspa.portal.Parameters; | |
| 15 | + | |
| 16 | +import java.sql.SQLException; | |
| 17 | + | |
| 18 | +public class WorkflowSession<I extends GlobalHttpProxyRequest> extends UniversalSession<I> { | |
| 19 | + | |
| 20 | + | |
| 21 | + public WorkflowSession(ServerCacheFactory cache, I request, boolean stage, ConnectionManager cmReadonly) { | |
| 22 | + super(cache, request, stage, cmReadonly); | |
| 23 | + } | |
| 24 | + | |
| 25 | + @Override | |
| 26 | + public void validate() throws ManagerException, CheckerException { | |
| 27 | + /* | |
| 28 | + * Verifico le credenziali utente passate nella request | |
| 29 | + */ | |
| 30 | + | |
| 31 | + if (XString.isBlankNullTrim(request.getUsername())) { | |
| 32 | + throw new CheckerException(ResponseOutcome.USERNAME_MANDATORY); | |
| 33 | + } | |
| 34 | + if (XString.isBlankNullTrim(request.getPassword())) { | |
| 35 | + throw new CheckerException(ResponseOutcome.PASSWORD_MANDATORY); | |
| 36 | + } | |
| 37 | + | |
| 38 | + | |
| 39 | + // Verifica credenziali su database workflow collegato | |
| 40 | + Utente utente = new Utente(); | |
| 41 | + utente.setUserName(request.getUsername()); | |
| 42 | + try { | |
| 43 | + utente.setPassword(request.getPassword()); | |
| 44 | + } catch (Exception e) { | |
| 45 | + throw new ManagerException("Error encoding password",e); | |
| 46 | + } | |
| 47 | + | |
| 48 | + DatabaseStatementUnplugged dbsu; | |
| 49 | + try { | |
| 50 | + dbsu = DatabaseStatementUnplugged.getInstance(cmReadonly); | |
| 51 | + utente.login(dbsu.getConnection()); | |
| 52 | + | |
| 53 | + Parameters parameters = Parameters.getInstance(); | |
| 54 | + | |
| 55 | + if (!utente.hasPolicy(parameters.get("POL_SA","SA")) && | |
| 56 | + !utente.hasPolicy(parameters.get("POL_UP_DOWN","UP_DOWN"))) { | |
| 57 | + // Utente con polici non valida | |
| 58 | + log.error("Not valid policy for username '"+request.getUsername()+"'"); | |
| 59 | + throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID); | |
| 60 | + } | |
| 61 | + | |
| 62 | + } catch (SQLException e) { | |
| 63 | + throw new ManagerException(e); | |
| 64 | + | |
| 65 | + } catch (AuthenticationException e) { | |
| 66 | + log.error("Error check credential with username '"+request.getUsername()+"': "+e.getMessage()); | |
| 67 | + // Username/Password non validi | |
| 68 | + throw new CheckerException(ResponseOutcome.USER_PASSWORD_NO_VALID); | |
| 69 | + } | |
| 70 | + | |
| 71 | + } | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | +} | ... | ... |
src/it/softecspa/fileproxy/proxyservices/request/AbstractHttpFileProxyRequest.java
| ... | ... | @@ -6,7 +6,6 @@ import it.softecspa.fileproxy.services.common.comunicator.http.HttpRemote; |
| 6 | 6 | import it.softecspa.fileproxy.services.common.core.request.Protocollo; |
| 7 | 7 | import it.softecspa.fileproxy.services.common.core.request.RemoteHostRequestInfo; |
| 8 | 8 | import it.softecspa.fileproxy.services.common.core.request.TrackRequestInfo; |
| 9 | -import it.softecspa.fileproxy.services.common.core.request.UniversalAuthenticatedRequest; | |
| 10 | 9 | |
| 11 | 10 | |
| 12 | 11 | public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyRequest, RemoteHostRequestInfo, TrackRequestInfo { |
| ... | ... | @@ -21,23 +20,27 @@ public abstract class AbstractHttpFileProxyRequest implements GlobalHttpProxyReq |
| 21 | 20 | // TrackRequestInfo |
| 22 | 21 | private boolean traceRequestInfo; |
| 23 | 22 | |
| 24 | - | |
| 23 | + // GlobalHttpProxyRequest | |
| 25 | 24 | private String username; |
| 26 | 25 | private String password; |
| 27 | 26 | |
| 28 | 27 | |
| 28 | + @Override | |
| 29 | 29 | public String getUsername() { |
| 30 | 30 | return username; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | + @Override | |
| 33 | 34 | public void setUsername(String username) { |
| 34 | 35 | this.username = username; |
| 35 | 36 | } |
| 36 | 37 | |
| 38 | + @Override | |
| 37 | 39 | public String getPassword() { |
| 38 | 40 | return password; |
| 39 | 41 | } |
| 40 | 42 | |
| 43 | + @Override | |
| 41 | 44 | public void setPassword(String password) { |
| 42 | 45 | this.password = password; |
| 43 | 46 | } | ... | ... |
src/it/softecspa/fileproxy/services/common/ResponseOutcome.java
| ... | ... | @@ -197,6 +197,8 @@ public enum ResponseOutcome { |
| 197 | 197 | , ORGANIZATION_NOT_MATCH_TOKEN_INFO (90539,"Organization not match token info") |
| 198 | 198 | , SESSION_LOGIN_WEB_ERROR (90540,"Error loading session login for web") |
| 199 | 199 | |
| 200 | + , USER_POLICY_NO_VALID (90543,"User with not valid policy") | |
| 201 | + , USERNAME_MANDATORY (90544,"Username mandatory") | |
| 200 | 202 | , ACCESS_TOKEN_USERNAME_MANDATORY (90545,"AccessToken or Username are mandatory") |
| 201 | 203 | , PASSWORD_MANDATORY (90546,"Password mandatory with username") |
| 202 | 204 | , TOO_MANY_SSO_LOGIN (90547,"Too many SSO-LOGIN; problem extracting addional") |
| ... | ... | @@ -438,6 +440,8 @@ public enum ResponseOutcome { |
| 438 | 440 | , DIRECTORY_JUST_EXIST (30008,"Directory just exist") |
| 439 | 441 | , ERROR_CREATING_DIR (30009,"Error creating directory") |
| 440 | 442 | , FOUND_NOT_VALID_CHAR (30010,"Found not valid char in path or filename") |
| 443 | + | |
| 444 | + | |
| 441 | 445 | //----------------- |
| 442 | 446 | |
| 443 | 447 | ... | ... |
src/it/softecspa/fileproxy/services/common/core/UniversalSession.java
| ... | ... | @@ -62,7 +62,7 @@ public abstract class UniversalSession <I extends UniversalRequest> { |
| 62 | 62 | |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public abstract void validate() throws CheckerException, SQLException; | |
| 65 | + public abstract void validate() throws ManagerException, CheckerException; | |
| 66 | 66 | |
| 67 | 67 | |
| 68 | 68 | public String getLanguage() { | ... | ... |
src/it/softecspa/fileproxy/services/common/core/UniversalStatementHttpServlet.java
| ... | ... | @@ -203,7 +203,7 @@ public abstract class UniversalStatementHttpServlet <UREQ extends UniversalReque |
| 203 | 203 | |
| 204 | 204 | |
| 205 | 205 | protected Logger log = Logger.getLogger(getClass()); |
| 206 | - private Logger statementLog = Logger.getLogger("it.softecspa.appbike.STATEMENT"); | |
| 206 | + private Logger statementLog = Logger.getLogger("it.softecspa.desktopmate.STATEMENT"); | |
| 207 | 207 | |
| 208 | 208 | |
| 209 | 209 | ... | ... |