branch develop-1.1.x updated (8360c36 -> 22db735)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 8360c36 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 22db735 correction affichage mail dans élément The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 22db7353886d211d83f4589b4e42dd316c56a31a Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 18:05:59 2015 +0100 correction affichage mail dans élément Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/src/main/resources/faxToMail.properties | 6 ++---- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 ++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 22db7353886d211d83f4589b4e42dd316c56a31a Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 18:05:59 2015 +0100 correction affichage mail dans élément --- faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/src/main/resources/faxToMail.properties | 6 ++---- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 ++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index af439e6..89e9afa 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-persistence/src/main/resources/faxToMail.properties b/faxtomail-persistence/src/main/resources/faxToMail.properties index 028c59d..9e4dc11 100644 --- a/faxtomail-persistence/src/main/resources/faxToMail.properties +++ b/faxtomail-persistence/src/main/resources/faxToMail.properties @@ -24,8 +24,8 @@ hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver -#hibernate.connection.url=jdbc:h2:file:/tmp/faxtomail/h2data;MODE=MSSQLServer;AUTO_SERVER=TRUE -hibernate.connection.url=jdbc:h2:file:/home/kmorin/faxtomail/h2data;MODE=MSSQLServer;AUTO_SERVER=TRUE;CACHE_SIZE=8192 +hibernate.connection.url=jdbc:h2:file:/tmp/faxtomail/h2data;MODE=MSSQLServer;AUTO_SERVER=TRUE +#hibernate.connection.url=jdbc:h2:file:/home/kmorin/faxtomail/h2data;MODE=MSSQLServer;AUTO_SERVER=TRUE;CACHE_SIZE=8192 hibernate.connection.username=sa hibernate.connection.password= @@ -39,8 +39,6 @@ hibernate.connection.password= #hibernate.hbm2ddl.auto=validate hibernate.hbm2ddl.auto= -hibernate.show_sql=true - hibernate.jdbc.batch_size=20 hibernate.c3p0.min_size=5 diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 221376c..6efb6bf 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ccb41e1..b28ef8c 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index 1d5ebd9..d0d2c8b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -925,6 +925,8 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU } } + plainContents = null; + htmlContents = null; if (message.isMimeType("multipart/*")) { decomposeMultipartEmail(message); diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ae27a3b..34ac334 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1ae0401..74fe516 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm