fix

Leonardo Vannucci

2018-09-18 2bda9e785a1016eedd31b104ce72226fdce05e71

fix

 dg1cloud-core/pom.xml
..
..
@@ -33,6 +33,7 @@
33
33
 		<dependency>
34
34
 			<groupId>org.flywaydb</groupId>
35
35
 			<artifactId>flyway-core</artifactId>
36
+			<version>4.0.1</version>
36
37
 		</dependency>
37
38
 
38
39
 		<dependency>
..
..
@@ -165,11 +166,15 @@
165
166
 				<configuration>
166
167
 					<schemaLanguage>WSDL</schemaLanguage>
167
168
 					<generatePackage>it.isharedoc.schemas.instance</generatePackage>
168
-					<schemas>
169
+					<schemaDirectory>${project.basedir}/etc/isd</schemaDirectory>
170
+					<schemaIncludes>
171
+						<schemaInclude>webserviceInstance3.wsdl</schemaInclude>
172
+					</schemaIncludes>
173
+					<!-- <schemas>
169
174
 						<schema>
170
175
 							<url>https://democorepa3.grupposistematica.it/isharedoc/webservices/webserviceInstance3.wsdl</url>
171
176
 						</schema>
172
-					</schemas>
177
+					</schemas> -->
173
178
 				</configuration>
174
179
 			</plugin>
175
180
 			<!-- end::wsdl[] -->
 dg1cloud-core/src/main/java/it/digione/dg1cloud/config/dg1cloud.properties
..
..
@@ -1,7 +1,7 @@
1
1
 application.version=v0.0.1beta
2
2
 
3
-repository.base.upload.path=/etc/dg1cloud/repository/upload
4
-repository.base.storage.path=/etc/dg1cloud/repository/storage
3
+repository.base.upload.path=/etc/digione/dg1cloud/repository/upload
4
+repository.base.storage.path=/etc/digione/dg1cloud/repository/storage
5
5
 
6
6
 repository.scanner.job.fixed.delay=60000
7
7
 repository.scanner.job.initial.delay=1000
..
..
@@ -19,6 +19,9 @@
19
19
 google.recaptcha.url=https://www.google.com/recaptcha/api/siteverify
20
20
 google.recaptcha.key=6LfCHmkUAAAAAFa1KmVtPFecItBriBHx1qmKHcVS
21
21
 google.recaptcha.secret=6LfCHmkUAAAAAKXdXWO36daHnItKQwkEvXOpX6YY
22
+#per albotest.grupposistematica.it
23
+#google.recaptcha.key=6LfjtnAUAAAAAHigYi-lWdvvd6cDb13R-8JEL9xr
24
+#google.recaptcha.secret=6LfjtnAUAAAAAJzerDHkZ_0niXTjIk_tvEehIzE4
22
25
 
23
26
 isharedoc.ws.endpoint.instance=https://democorepa3.grupposistematica.it/isharedoc/webservices/instanceService3/
24
27
 isharedoc.ws.username=admin
 dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/StartURPController.java
..
..
@@ -101,6 +101,7 @@
101
101
 				modelAndView.addObject("message", "Richiesta inviata con successo");
102
102
 				modelAndView.addObject("alertClass", "alert-success");
103
103
 			} catch (Exception e) {
104
+				logger.error("Errore invio email", e);
104
105
 				modelAndView.addObject("message", "Richiesta inviata con successo, ma non è stato possibile inviare la conferma tramite email");
105
106
 				modelAndView.addObject("alertClass", "alert-warning");
106
107
 			}
 dg1cloud-core/src/main/java/logback.xml
..
..
@@ -1,4 +1,5 @@
1
1
 <?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE xml>
2
3
 <configuration>
3
4
 	
4
5
 	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 dg1cloud-core/src/main/resources/application.properties
..
..
@@ -1,6 +1,6 @@
1
1
 spring.datasource.url=jdbc:postgresql://localhost:5432/dg1cloud
2
-spring.datasource.username=postgres
3
-spring.datasource.password=passero
2
+#spring.datasource.username=postgres
3
+#spring.datasource.password=passero
4
4
 spring.datasource.driver-class-name=org.postgresql.Driver
5
5
 spring.datasource.tomcat.initial-size=10
6
6
 spring.datasource.tomcat.max-wait=30000 
..
..
@@ -19,6 +19,8 @@
19
19
 #server.address=vannux.grupposistematica.it
20
20
 server.error.include-stacktrace=always
21
21
 
22
+logging.config=file:/etc/digione/dg1cloud/logback.xml
23
+
22
24
 logging.level.it.digione.dg1cloud=DEBUG
23
25
 
24
26
 logging.level.org.springframework.ws=TRACE