Faxtomail-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- 1934 discussions
r128 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment
by echatellier@users.forge.codelutin.com 03 Jun '14
by echatellier@users.forge.codelutin.com 03 Jun '14
03 Jun '14
Author: echatellier
Date: 2014-06-03 17:42:28 +0200 (Tue, 03 Jun 2014)
New Revision: 128
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/128
Log:
refs #4662: Import des utilisateurs et groupes depuis le serveur LDAP
Added:
trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/LdapServiceTest.java
Modified:
trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java
Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo
===================================================================
(Binary files differ)
Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-03 07:31:14 UTC (rev 127)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-03 15:42:28 UTC (rev 128)
@@ -4,6 +4,7 @@
import java.util.Collection;
import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,23 +53,58 @@
// ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=posixGroup"
// ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=account"
- String baseDN = "ou=People,DC=codelutin,DC=home";
- String filter = "(objectClass=account)";
+ String[] baseDNs = {
+ "OU=Utilisateurs,OU=Faber,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=OU Informatique,OU=France-Fermetures,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ // OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net
+ "OU=Utilisateurs,OU=Carros,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Checy,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Guipry,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=LeRheu,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Luzech,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=MaisonAlfort,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Mauguio,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Migennes,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=Nomades,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net",
+ "OU=Utilisateurs,OU=RocheToirin,OU=Franciaflex,OU=Utilisateurs,OU=Mac-Groupe,DC=mac-groupe,DC=net"
+ };
+ String filter = "(objectClass=user)";
+
LDAPConnection connection = null;
try {
connection = getLDAPConnection();
if (connection.isConnected()) {
- SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter);
-
- List<SearchResultEntry> searchEntries = searchResult.getSearchEntries();
- for (SearchResultEntry searchEntry : searchEntries) {
- LdapUser user = new LdapUser();
- user.setLogin(searchEntry.getAttributeValue("uid"));
- user.setLogin(searchEntry.getAttributeValue("uid"));
- user.setLogin(searchEntry.getAttributeValue("uid"));
+ for (String baseDN : baseDNs) {
+ SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter);
- results.add(user);
+ List<SearchResultEntry> searchEntries = searchResult.getSearchEntries();
+ for (SearchResultEntry searchEntry : searchEntries) {
+ LdapUser user = new LdapUser();
+ user.setLogin(searchEntry.getAttributeValue("userPrincipalName"));
+
+ // Parse name
+ String fullName = searchEntry.getAttributeValue("name");
+ if (fullName.indexOf(' ') != -1) {
+ String lastName = fullName.substring(0, fullName.indexOf(' '));
+ String firstName = fullName.substring(fullName.indexOf(' ') + 1);
+ user.setFirstName(firstName);
+ user.setLastName(lastName);
+ } else {
+ user.setFirstName("");
+ user.setLastName(fullName);
+ }
+
+ // parse groups
+ String[] groups = searchEntry.getAttributeValues("memberOf");
+ if (ArrayUtils.isNotEmpty(groups)) {
+ for (String group : groups) {
+ user.addGroup(group);
+ }
+ }
+
+ results.add(user);
+ }
}
}
} catch (LDAPException ex) {
@@ -121,9 +157,13 @@
Collection<String> groups = ldapUser.getGroups();
user.clearFaxToMailUserGroup();
for (String group : groups) {
- FaxToMailUserGroup userGroup = faxToMailUserGroupDao.forNameEquals(group).findUniqueOrNull();
+ String groupPath = getGroupFullPath(group);
+ String groupName = StringUtils.substringAfterLast(groupPath, "/");
+ FaxToMailUserGroup userGroup = faxToMailUserGroupDao.forNameEquals(groupName).findUniqueOrNull();
if (userGroup == null) {
- userGroup = faxToMailUserGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, group);
+ userGroup = faxToMailUserGroupDao.create(
+ FaxToMailUserGroup.PROPERTY_NAME, groupName,
+ FaxToMailUserGroup.PROPERTY_FULL_PATH, groupPath);
}
user.addFaxToMailUserGroup(userGroup);
}
@@ -135,7 +175,24 @@
faxtomailUserDao.create(user);
}
}
-
+
getPersistenceContext().commit();
}
+
+ /**
+ * Transform group CN to group path.
+ *
+ * Example:
+ * CN=Tout Franciaflex,OU=Listes de distribution,OU=Comptes Spéciaux,OU=Mac-Groupe,DC=mac-groupe,DC=net
+ * net/mac-groupe/Mac-Groupe/Comptes Spéciaux/Listes de distribution/Tout Franciaflex
+ *
+ * @param groupCN
+ * @return
+ */
+ protected String getGroupFullPath(String groupCN) {
+ String[] part = groupCN.split(",");
+ ArrayUtils.reverse(part);
+ String result = StringUtils.join(part, '/');
+ return result;
+ }
}
Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/LdapServiceTest.java
===================================================================
--- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/LdapServiceTest.java (rev 0)
+++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/LdapServiceTest.java 2014-06-03 15:42:28 UTC (rev 128)
@@ -0,0 +1,42 @@
+package com.franciaflex.faxtomail.services.service;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.franciaflex.faxtomail.FaxToMailConfigurationOption;
+import com.franciaflex.faxtomail.services.service.ldap.LdapUser;
+
+public class LdapServiceTest extends AbstractFaxToMailServiceTest {
+
+ protected LdapService ldapService;
+
+ @Before
+ public void setUp() throws IOException {
+ ldapService = newService(LdapService.class);
+
+ // n'effectue pas les tests si la connexion n'est pas possible
+ Assume.assumeTrue(StringUtils.isNotBlank(getApplicationConfig().getLdapHost()));
+ }
+
+ @Test
+ public void testGetUsers() {
+
+ Collection<LdapUser> ldapUsers = ldapService.getAllLdapUsers();
+ Collection<String> groups = new HashSet<>();
+ int user = 0;
+ for (LdapUser ldapUser : ldapUsers) {
+ System.out.println("User : " + ldapUser.getLogin());
+ for (String group : ldapUser.getGroups()) {
+ groups.add(group);
+ }
+ user++;
+ }
+ System.out.println(String.format("%d users, %d groups", user, groups.size()));
+ }
+}
Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/LdapServiceTest.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-03 07:31:14 UTC (rev 127)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-03 15:42:28 UTC (rev 128)
@@ -32,11 +32,14 @@
import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+
import jaxx.runtime.SwingUtil;
import jaxx.runtime.validator.swing.SwingValidator;
+
import org.apache.commons.collections4.CollectionUtils;
import org.jdesktop.swingx.JXTable;
import org.jdesktop.swingx.decorator.HighlighterFactory;
+import org.nuiton.util.DesktopUtil;
import org.nuiton.util.FileUtil;
import java.awt.Component;
@@ -181,7 +184,7 @@
getModel().fireAttachmentOpened(attachment, true);
File file = attachment.getOriginalFile().getFile();
- Desktop desktop = FaxToMailUIUtil.getDesktopForBrowse();
+ Desktop desktop = FaxToMailUIUtil.getDesktopForOpen();
try {
desktop.open(file);
} catch (IOException e) {
1
0
03 Jun '14
Author: echatellier
Date: 2014-06-03 09:31:14 +0200 (Tue, 03 Jun 2014)
New Revision: 127
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/127
Log:
Refactoring des actions et actions contextuelles.
Added:
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java
Removed:
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Field.java
trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java
Modified:
trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java
trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java
trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java
trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties
trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp
trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
Deleted: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java
===================================================================
--- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -1,36 +0,0 @@
-package com.franciaflex.faxtomail.persistence.entities;
-
-/*
- * #%L
- * FaxToMail :: Persistence
- * $Id: Action.java 48 2014-04-25 13:43:04Z echatellier $
- * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-persistence/src/main/ja… $
- * %%
- * Copyright (C) 2014 Franciaflex, Code Lutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-/**
- * @author Kevin Morin (Code Lutin)
- * @since x.x
- */
-public enum ContextAction {
-
- CHANGE_PRIORITY,
- AUTO_SAVE
-
-}
Deleted: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Field.java
===================================================================
--- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Field.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Field.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -1,55 +0,0 @@
-package com.franciaflex.faxtomail.persistence.entities;
-
-/*
- * #%L
- * FaxToMail :: Persistence
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2014 Franciaflex, Code Lutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-/**
- * Required email fields for specific {@link EtatAttente}.
- *
- * @author Eric Chatellier
- */
-public enum Field {
-
- SENDER,
- RECEPTION_DATE,
- EDI_CODE_NUMBER,
- OBJECT,
- PROJECT_REFERENCE,
- PRIORITY,
- RANGE_ROW,
- MAIL_FOLDER,
- CLIENT,
- DEMANDE_STATUS,
- DEMAND_TYPE,
- TAKEN_BY,
- ETAT_ATTENTE,
- ATTACHMENT
-
- //FAX,
- //RECIPIENT,
- //ARCHIVE_DATE,
- //COMPANY_REFERENCE,
- //ORIGINAL_EMAIL,
- //COMMENT
-}
Copied: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java (from rev 125, trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java)
===================================================================
--- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java (rev 0)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -0,0 +1,49 @@
+package com.franciaflex.faxtomail.persistence.entities;
+
+/*
+ * #%L
+ * FaxToMail :: Persistence
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ * @since x.x
+ */
+public enum MailAction {
+
+ SAVE(false),
+ TRANSMIT(false),
+ PRINT(true),
+ ARCHIVE(true),
+ REPLY(true),
+ GROUP(false);
+
+ protected boolean contextuable;
+
+ private MailAction(boolean contextuable) {
+ this.contextuable = contextuable;
+ }
+
+ public boolean isContextuable() {
+ return contextuable;
+ }
+}
Copied: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java (from rev 125, trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Field.java)
===================================================================
--- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java (rev 0)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -0,0 +1,55 @@
+package com.franciaflex.faxtomail.persistence.entities;
+
+/*
+ * #%L
+ * FaxToMail :: Persistence
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2014 Franciaflex, Code Lutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+/**
+ * Required email fields for specific {@link EtatAttente}.
+ *
+ * @author Eric Chatellier
+ */
+public enum MailField {
+
+ SENDER,
+ RECEPTION_DATE,
+ EDI_CODE_NUMBER,
+ OBJECT,
+ PROJECT_REFERENCE,
+ PRIORITY,
+ RANGE_ROW,
+ MAIL_FOLDER,
+ CLIENT,
+ DEMANDE_STATUS,
+ DEMAND_TYPE,
+ TAKEN_BY,
+ ETAT_ATTENTE,
+ ATTACHMENT
+
+ //FAX,
+ //RECIPIENT,
+ //ARCHIVE_DATE,
+ //COMPANY_REFERENCE,
+ //ORIGINAL_EMAIL,
+ //COMMENT
+}
Deleted: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java
===================================================================
--- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -1,40 +0,0 @@
-package com.franciaflex.faxtomail.persistence.entities;
-
-/*
- * #%L
- * FaxToMail :: Persistence
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2014 Franciaflex, Code Lutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-/**
- * @author Kevin Morin (Code Lutin)
- * @since x.x
- */
-public enum MainAction {
-
- SAVE,
- TRANSMIT,
- PRINT,
- ARCHIVE,
- REPLY,
- GROUP
-
-}
Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo
===================================================================
(Binary files differ)
Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -29,7 +29,7 @@
import com.franciaflex.faxtomail.persistence.entities.DemandStatus;
import com.franciaflex.faxtomail.persistence.entities.Email;
import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
-import com.franciaflex.faxtomail.persistence.entities.Field;
+import com.franciaflex.faxtomail.persistence.entities.MailField;
import com.franciaflex.faxtomail.persistence.entities.History;
import com.franciaflex.faxtomail.persistence.entities.HistoryImpl;
import com.franciaflex.faxtomail.persistence.entities.HistoryType;
@@ -285,11 +285,11 @@
Collection<String> columns = null;
MailFolder selectedFolder = getModel().getSelectedFolder();
if (selectedFolder != null) {
- List<Field> tableColumns = selectedFolder.getFolderTableColumns();
+ List<MailField> tableColumns = selectedFolder.getFolderTableColumns();
if (tableColumns != null) {
- Collections2.transform(tableColumns, new Function<Field, String>() {
+ Collections2.transform(tableColumns, new Function<MailField, String>() {
@Override
- public String apply(Field field) {
+ public String apply(MailField field) {
return field.toString();
}
});
Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -28,7 +28,7 @@
import com.franciaflex.faxtomail.persistence.entities.Email;
import com.franciaflex.faxtomail.persistence.entities.EmailFilter;
import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
-import com.franciaflex.faxtomail.persistence.entities.Field;
+import com.franciaflex.faxtomail.persistence.entities.MailField;
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
import com.franciaflex.faxtomail.services.service.EmailService;
import com.franciaflex.faxtomail.services.service.ReferentielService;
@@ -230,11 +230,11 @@
@Override
protected Collection<String> getColumns() {
Collection<String> columns = null;
- List<Field> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns();
+ List<MailField> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns();
if (tableColumns != null) {
- Collections2.transform(tableColumns, new Function<Field, String>() {
+ Collections2.transform(tableColumns, new Function<MailField, String>() {
@Override
- public String apply(Field field) {
+ public String apply(MailField field) {
return field.toString();
}
});
Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java
===================================================================
--- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -26,7 +26,7 @@
import com.franciaflex.faxtomail.persistence.entities.Email;
import com.franciaflex.faxtomail.persistence.entities.EmailFilter;
import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
-import com.franciaflex.faxtomail.persistence.entities.Field;
+import com.franciaflex.faxtomail.persistence.entities.MailField;
import com.franciaflex.faxtomail.persistence.entities.HasLabel;
import com.franciaflex.faxtomail.services.service.ReferentielService;
import com.franciaflex.faxtomail.ui.swing.actions.SearchAction;
@@ -201,11 +201,11 @@
@Override
protected Collection<String> getColumns() {
Collection<String> columns = null;
- List<Field> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns();
+ List<MailField> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns();
if (tableColumns != null) {
- Collections2.transform(tableColumns, new Function<Field, String>() {
+ Collections2.transform(tableColumns, new Function<MailField, String>() {
@Override
- public String apply(Field field) {
+ public String apply(MailField field) {
return field.toString();
}
});
Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java
===================================================================
--- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-03 07:31:14 UTC (rev 127)
@@ -34,14 +34,13 @@
import com.franciaflex.faxtomail.persistence.entities.Configuration;
import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl;
-import com.franciaflex.faxtomail.persistence.entities.ContextAction;
import com.franciaflex.faxtomail.persistence.entities.EmailAccount;
import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
-import com.franciaflex.faxtomail.persistence.entities.Field;
+import com.franciaflex.faxtomail.persistence.entities.MailField;
import com.franciaflex.faxtomail.persistence.entities.MailFilter;
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
-import com.franciaflex.faxtomail.persistence.entities.MainAction;
+import com.franciaflex.faxtomail.persistence.entities.MailAction;
import com.franciaflex.faxtomail.services.service.ConfigurationService;
import com.franciaflex.faxtomail.services.service.MailFolderService;
import com.franciaflex.faxtomail.services.service.ReferentielService;
@@ -134,16 +133,17 @@
this.etatAttentes = getGson().fromJson(json, type);
}
- public Map<MainAction, String> getMainActions() {
- return getEnumAsMap(MainAction.values());
+ public Map<MailAction, String> getMailActions() {
+ return getEnumAsMap(MailAction.values());
}
- public Map<ContextAction, String> getContextActions() {
- return getEnumAsMap(ContextAction.values());
+ public Map<MailAction, String> getContextMailActions() {
+ // FIXME add filter on isContextual
+ return getEnumAsMap(MailAction.ARCHIVE, MailAction.PRINT, MailAction.REPLY);
}
- public Map<Field, String> getFields() {
- return getEnumAsMap(Field.values());
+ public Map<MailField, String> getMailFields() {
+ return getEnumAsMap(MailField.values());
}
public List<MailFolder> getMailFolders() {
Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties
===================================================================
--- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-06-03 07:31:14 UTC (rev 127)
@@ -1,29 +1,27 @@
-com.franciaflex.faxtomail.persistence.entities.ContextAction.AUTO_SAVE=Sauver automatiquement
-com.franciaflex.faxtomail.persistence.entities.ContextAction.CHANGE_PRIORITY=Changer la priorité
-com.franciaflex.faxtomail.persistence.entities.Field.ARCHIVE_DATE=Date d'archive
-com.franciaflex.faxtomail.persistence.entities.Field.ATTACHMENT=Pièces jointes
-com.franciaflex.faxtomail.persistence.entities.Field.CLIENT=Client
-com.franciaflex.faxtomail.persistence.entities.Field.COMMENT=Commentaire
-com.franciaflex.faxtomail.persistence.entities.Field.COMPANY_REFERENCE=Référence
-com.franciaflex.faxtomail.persistence.entities.Field.DEMANDE_STATUS=Statut de demande
-com.franciaflex.faxtomail.persistence.entities.Field.DEMAND_TYPE=Type de demande
-com.franciaflex.faxtomail.persistence.entities.Field.EDI_CODE_NUMBER=Code EDI
-com.franciaflex.faxtomail.persistence.entities.Field.ETAT_ATTENTE=État d'attente
-com.franciaflex.faxtomail.persistence.entities.Field.FAX=Fax
-com.franciaflex.faxtomail.persistence.entities.Field.MAIL_FOLDER=Dossier
-com.franciaflex.faxtomail.persistence.entities.Field.OBJECT=Objet
-com.franciaflex.faxtomail.persistence.entities.Field.ORIGINAL_EMAIL=Email original
-com.franciaflex.faxtomail.persistence.entities.Field.PRIORITY=Priorité
-com.franciaflex.faxtomail.persistence.entities.Field.PROJECT_REFERENCE=Réference projet
-com.franciaflex.faxtomail.persistence.entities.Field.RANGE_ROW=Gamme
-com.franciaflex.faxtomail.persistence.entities.Field.RECEPTION_DATE=Date de réception
-com.franciaflex.faxtomail.persistence.entities.Field.RECIPIENT=Destinataire
-com.franciaflex.faxtomail.persistence.entities.Field.SENDER=Expéditeur
-com.franciaflex.faxtomail.persistence.entities.Field.TAKEN_BY=Pris par
-com.franciaflex.faxtomail.persistence.entities.MainAction.ARCHIVE=Archiver
-com.franciaflex.faxtomail.persistence.entities.MainAction.GROUP=Grouper
-com.franciaflex.faxtomail.persistence.entities.MainAction.PRINT=Imprimer
-com.franciaflex.faxtomail.persistence.entities.MainAction.REPLY=Repondre
-com.franciaflex.faxtomail.persistence.entities.MainAction.SAVE=Sauver
-com.franciaflex.faxtomail.persistence.entities.MainAction.TRANSMIT=Déplacer
+com.franciaflex.faxtomail.persistence.entities.MailAction.ARCHIVE=Archiver
+com.franciaflex.faxtomail.persistence.entities.MailAction.GROUP=Grouper
+com.franciaflex.faxtomail.persistence.entities.MailAction.PRINT=Imprimer
+com.franciaflex.faxtomail.persistence.entities.MailAction.REPLY=Repondre
+com.franciaflex.faxtomail.persistence.entities.MailAction.SAVE=Sauver
+com.franciaflex.faxtomail.persistence.entities.MailAction.TRANSMIT=Déplacer
+com.franciaflex.faxtomail.persistence.entities.MailField.ARCHIVE_DATE=Date d'archive
+com.franciaflex.faxtomail.persistence.entities.MailField.ATTACHMENT=Pièces jointes
+com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT=Client
+com.franciaflex.faxtomail.persistence.entities.MailField.COMMENT=Commentaire
+com.franciaflex.faxtomail.persistence.entities.MailField.COMPANY_REFERENCE=Référence
+com.franciaflex.faxtomail.persistence.entities.MailField.DEMANDE_STATUS=Statut de demande
+com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande
+com.franciaflex.faxtomail.persistence.entities.MailField.EDI_CODE_NUMBER=Code EDI
+com.franciaflex.faxtomail.persistence.entities.MailField.ETAT_ATTENTE=État d'attente
+com.franciaflex.faxtomail.persistence.entities.MailField.FAX=Fax
+com.franciaflex.faxtomail.persistence.entities.MailField.MAIL_FOLDER=Dossier
+com.franciaflex.faxtomail.persistence.entities.MailField.OBJECT=Objet
+com.franciaflex.faxtomail.persistence.entities.MailField.ORIGINAL_EMAIL=Email original
+com.franciaflex.faxtomail.persistence.entities.MailField.PRIORITY=Priorité
+com.franciaflex.faxtomail.persistence.entities.MailField.PROJECT_REFERENCE=Réference projet
+com.franciaflex.faxtomail.persistence.entities.MailField.RANGE_ROW=Gamme
+com.franciaflex.faxtomail.persistence.entities.MailField.RECEPTION_DATE=Date de réception
+com.franciaflex.faxtomail.persistence.entities.MailField.RECIPIENT=Destinataire
+com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Expéditeur
+com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par
faxtomail.email.projectReference.default=
Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-03 07:31:14 UTC (rev 127)
@@ -47,9 +47,9 @@
angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'ui.sortable', 'ui.select2.sortable'])
.value('ConfigurationData', {
// enums
- 'mainActions': <s:property value="toJson(mainActions)" escapeHtml="false"/>,
- 'contextActions': <s:property value="toJson(contextActions)" escapeHtml="false"/>,
- 'fields': <s:property value="toJson(fields)" escapeHtml="false"/>,
+ 'mailActions': <s:property value="toJson(mailActions)" escapeHtml="false"/>,
+ 'contextMailActions': <s:property value="toJson(contextMailActions)" escapeHtml="false"/>,
+ 'mailFields': <s:property value="toJson(mailFields)" escapeHtml="false"/>,
// datas
'etatAttentes' : <s:property value="toJson(etatAttentes)" escapeHtml="false"/>,
'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>,
@@ -119,14 +119,14 @@
<div class="col-md-7" ng-if="selectedEtatAttente">
<h3>Édition de l'état d'attente {{selectedEtatAttente.label}}</h3>
Champs obligatoires pour l'état d'attente :
- <label class="checkbox" ng-repeat="(field,label) in fields">
- <input type="checkbox" ng-checked="selectedEtatAttente.fields.indexOf(field) != -1"
- ng-click="changeEtatAttenteField(field)"> {{label}}
+ <label class="checkbox" ng-repeat="(mailField,label) in mailFields">
+ <input type="checkbox" ng-checked="selectedEtatAttente.fields.indexOf(mailField) != -1"
+ ng-click="changeEtatAttenteField(mailField)"> {{label}}
</label>
Actions autorisées pour l'état d'attente :
- <label class="checkbox" ng-repeat="(mainAction,label) in mainActions">
- <input type="checkbox" ng-checked="selectedEtatAttente.mainActions.indexOf(mainAction) != -1"
- ng-click="changeEtatAttenteAction(mainAction)"> {{label}}
+ <label class="checkbox" ng-repeat="(mailAction,label) in mailActions">
+ <input type="checkbox" ng-checked="selectedEtatAttente.mailActions.indexOf(mailAction) != -1"
+ ng-click="changeEtatAttenteAction(mailAction)"> {{label}}
</label>
</div>
<div class="col-md-7" ng-if="!selectedEtatAttente">
@@ -335,9 +335,9 @@
</div>
<div id="collapse5" class="panel-collapse collapse">
<div class="panel-body">
- <label class="checkbox" ng-repeat="(contextAction,label) in contextActions">
- <input type="checkbox" ng-checked="selectedMailFolder.contextActions.indexOf(contextAction) != -1"
- ng-click="changeFolderAction(contextAction)"> {{label}}
+ <label class="checkbox" ng-repeat="(contextMailAction,label) in contextMailActions">
+ <input type="checkbox" ng-checked="selectedMailFolder.contextActions.indexOf(contextMailAction) != -1"
+ ng-click="changeFolderAction(contextMailAction)"> {{label}}
</label>
</div>
</div>
Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-03 07:30:29 UTC (rev 126)
+++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-03 07:31:14 UTC (rev 127)
@@ -28,11 +28,11 @@
FaxToMailModule.controller('ConfigurationController', ['$scope', '$http', 'ConfigurationData',
function($scope, $http, ConfigurationData) {
//{Map} les actions possibles pour les etats d'attentes
- $scope.mainActions = ConfigurationData.mainActions;
+ $scope.mailActions = ConfigurationData.mailActions;
//{Map} les champs obligatoires possibles
- $scope.fields = ConfigurationData.fields;
+ $scope.mailFields = ConfigurationData.mailFields;
//{Map} les actions contextuelles possibles pour les dossiers
- $scope.contextActions = ConfigurationData.contextActions;
+ $scope.contextMailActions = ConfigurationData.contextMailActions;
//{Array} les etats d'attentes disponibles
$scope.etatAttentes = ConfigurationData.etatAttentes;
//{Array} mail folders
@@ -105,22 +105,22 @@
// selection/deselection d'une action
$scope.changeEtatAttenteAction = function(action) {
- var index = $scope.selectedEtatAttente.mainActions.indexOf(action);
+ var index = $scope.selectedEtatAttente.mailActions.indexOf(action);
if (index != -1) {
- $scope.selectedEtatAttente.mainActions.splice(index, 1);
+ $scope.selectedEtatAttente.mailActions.splice(index, 1);
} else {
- $scope.selectedEtatAttente.mainActions.push(action);
+ $scope.selectedEtatAttente.mailActions.push(action);
}
};
// selection/deselection d'un champ
- $scope.changeEtatAttenteField = function(field) {
+ $scope.changeEtatAttenteField = function(mailField) {
- var index = $scope.selectedEtatAttente.fields.indexOf(field);
+ var index = $scope.selectedEtatAttente.fields.indexOf(mailField);
if (index != -1) {
$scope.selectedEtatAttente.fields.splice(index, 1);
} else {
- $scope.selectedEtatAttente.fields.push(field);
+ $scope.selectedEtatAttente.fields.push(mailField);
}
};
}]);
@@ -267,12 +267,12 @@
};
// selection/deselection d'une action possible du menu contextuel pour ce dossier
- $scope.changeFolderAction = function(contextAction) {
- var index = $scope.selectedMailFolder.contextActions.indexOf(contextAction);
+ $scope.changeFolderAction = function(mailAction) {
+ var index = $scope.selectedMailFolder.contextActions.indexOf(mailAction);
if (index != -1) {
$scope.selectedMailFolder.contextActions.splice(index, 1);
} else {
- $scope.selectedMailFolder.contextActions.push(contextAction);
+ $scope.selectedMailFolder.contextActions.push(mailAction);
}
};
}]);
@@ -319,9 +319,9 @@
// fonction retournant l'ensemble des options disponibles
$scope.getObjectsData = function(term, result) {
var resultArray = [];
- angular.forEach($scope.fields, function(label, field) {
+ angular.forEach($scope.mailFields, function(label, mailField) {
resultArray.push({
- id: field,
+ id: mailField,
label: label
});
});
1
0
r126 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier@users.forge.codelutin.com 03 Jun '14
by echatellier@users.forge.codelutin.com 03 Jun '14
03 Jun '14
Author: echatellier
Date: 2014-06-03 09:30:29 +0200 (Tue, 03 Jun 2014)
New Revision: 126
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/126
Log:
Correction d'une erreur sur la gestion des pieces jointes lors de la reception des mails.
Modified:
trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java
Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java
===================================================================
--- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-02 21:06:54 UTC (rev 125)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-03 07:30:29 UTC (rev 126)
@@ -257,14 +257,19 @@
emailSource.append("\n").append(originalContent);
email.setOriginalEmail(emailSource.toString());
+ List<Attachment> attachements = new ArrayList<>();
if (message.isMimeType("multipart/*")) {
- decomposeMultipartEmail(message, email, emailService);
+ decomposeMultipartEmail(attachements, message, email, emailService);
// } else {
// String content = IOUtils.toString(message.getInputStream(), charset);
// email.setPlainContent(content);
}
- emailService.saveEmail(email, null, modifiedProperties.toArray(new String[modifiedProperties.size()]));
+ emailService.saveEmail(email,
+ attachements,
+ email.getClient() != null ? email.getClient().getCode() : null,
+ null,
+ modifiedProperties.toArray(new String[modifiedProperties.size()]));
message.setFlag(Flags.Flag.DELETED, true);
}
@@ -285,11 +290,12 @@
* @param emailService email service
* @throws Exception
*/
- protected void decomposeMultipartEmail(Part part, Email email, EmailService emailService) throws Exception {
+ protected void decomposeMultipartEmail(List<Attachment> attachments, Part part, Email email, EmailService emailService) throws Exception {
DataSource dataSource = part.getDataHandler().getDataSource();
MimeMultipart mimeMultipart = new MimeMultipart(dataSource);
int multiPartCount = mimeMultipart.getCount();
+
for (int j = 0; j < multiPartCount; j++) {
BodyPart bp = mimeMultipart.getBodyPart(j);
Charset charset = getCharset(bp);
@@ -306,7 +312,7 @@
// if it is multipart part, decompose it
} else if (bp.isMimeType("multipart/*")) {
- decomposeMultipartEmail(bp, email, emailService);
+ decomposeMultipartEmail(attachments, bp, email, emailService);
// else, this is an attachment
} else {
@@ -347,7 +353,8 @@
attachmentFile.setFilename(dh.getName());
attachment.setOriginalFile(attachmentFile);
- email.addAttachment(attachment);
+ //email.addAttachment(attachment);
+ attachments.add(attachment);
}
}
}
1
0
02 Jun '14
See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/39/changes>
Changes:
[kmorin] fix swing session new exception thrown
[kmorin] add validator on the range table
[echatellier] refs #4662: Begin ldap job to update database
[echatellier] refs #4662: Amelioration de l'interface (ajout/suppression/fioritures)
[echatellier] Disable ldap if not configured
[echatellier] Refactoring de l'interface de configuration/folder/input
[kmorin] use configuration for the email max size and search columns
[kmorin] fix bug of search to group when there is a search in the context
[kmorin] fixes #5154 Bug à l'ajout d'une pièce jointe dans une réponse à un message
[kmorin] fixes #5157 Dans l'arborescence des éléments, le clic sur une partie vide de la liste des messages entraine une exception
fixes #5158 Un message archivé peut être déplacé
[echatellier] refs #4662: Display ldap groups
[kmorin] fixes #5150 NPE au clic sur un noeud de l'arborescence
------------------------------------------
[...truncated 899 lines...]
[INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…>
[INFO] Copying faxtomail-0.1-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…>
[INFO] Copying faxtomail-0.1-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…>
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ faxtomail-ui-web ---
[INFO] Copying faxtomail-0.1-SNAPSHOT.war to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…>
[INFO]
[INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ faxtomail-ui-web ---
[INFO]
[INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ faxtomail-ui-web ---
[INFO] Used declared dependencies found:
[INFO] com.franciaflex.faxtomail:faxtomail-persistence:jar:0.1-SNAPSHOT:compile
[INFO] com.franciaflex.faxtomail:faxtomail-service:jar:0.1-SNAPSHOT:compile
[INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile
[INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile
[INFO] org.nuiton.jaxx:jaxx-application-api:jar:2.8.6-SNAPSHOT:compile
[INFO] commons-logging:commons-logging:jar:1.1.3:compile
[INFO] commons-io:commons-io:jar:2.4:compile
[INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile
[INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile
[INFO] com.google.guava:guava:jar:17.0:compile
[INFO] org.apache.struts:struts2-core:jar:2.3.16.3:compile
[INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.3:compile
[INFO] org.apache.commons:commons-collections4:jar:4.0:compile
[INFO] javax.servlet:servlet-api:jar:2.5:provided
[INFO] org.apache.struts:struts2-convention-plugin:jar:2.3.16.3:compile
[INFO] com.google.code.gson:gson:jar:2.2.4:compile
[INFO] log4j:log4j:jar:1.2.17:compile
[INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile
[INFO] org.quartz-scheduler:quartz:jar:2.2.1:compile
[INFO] javax.mail:mail:jar:1.4.7:compile
[INFO] javax.activation:activation:jar:1.1.1:compile
[INFO]
[INFO] --- maven-install-plugin:2.5.1:install (default-install) @ faxtomail-ui-web ---
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.war
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.pom
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-third-party.properties
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-sources.jar
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-javadoc.jar
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.war.asc
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.pom.asc
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-third-party.properties.asc
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-sources.jar.asc
[INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-javadoc.jar.asc
[JENKINS] Archiving disabled
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building FaxToMail :: UI 0.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 28.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 28.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 31.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 30.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 66.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 60.7 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 61.1 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing ---
[INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-ui-swing ---
[INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey}
[INFO]
[INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing ---
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 58.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec)
[INFO] use project compile scope class-path
[INFO] Detects 26 modified jaxx file(s).
[INFO] Generated 26 file(s) in 4.623s
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing ---
[INFO] Load rules file validation.rules
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing ---
[INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 27/289 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing ---
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2…
[INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 62/536 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing ---
[INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> is up-to-date.
[INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO]
[INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-ui-swing ---
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Scan 1 file header done in 7.657ms.
[INFO] All files are up-to-date.
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 45 resources
[INFO] Copying 3 resources
[INFO] Copying 4 resources
[INFO]
[INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-ui-swing ---
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] Scan 171 files header done in 597.173ms.
[INFO]
* uptodate header on 143 files.
* add header on 28 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing ---
[INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>: Recompile with -Xlint:unchecked for details.
[INFO] 2 warnings
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown
[INFO] 1 error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] FaxToMail ......................................... SUCCESS [ 8.203 s]
[INFO] FaxToMail :: Persistence .......................... SUCCESS [ 22.817 s]
[INFO] FaxToMail :: Service .............................. SUCCESS [ 13.186 s]
[INFO] FaxToMail :: Web .................................. SUCCESS [ 9.331 s]
[INFO] FaxToMail :: UI ................................... FAILURE [ 12.126 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 01:07 min
[INFO] Finished at: 2014-05-31T01:16:28+01:00
[INFO] Final Memory: 97M/912M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure
[ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure
<http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure
<http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown
at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858)
at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
... 30 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :faxtomail-ui-swing
Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com chatellier(a)codelutin.com morin(a)codelutin.com
Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com morin(a)codelutin.com
channel stopped
Skipping sonar analysis due to bad build status FAILURE
1
2
Jenkins build became unstable: faxtomail-nightly » FaxToMail :: Service #39
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
02 Jun '14
Build failed in Jenkins: faxtomail-nightly » FaxToMail :: UI #39
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
02 Jun '14
See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
Changes:
[kmorin] fix swing session new exception thrown
[kmorin] add validator on the range table
[kmorin] use configuration for the email max size and search columns
[kmorin] fix bug of search to group when there is a search in the context
[kmorin] fixes #5154 Bug à l'ajout d'une pièce jointe dans une réponse à un message
[kmorin] fixes #5157 Dans l'arborescence des éléments, le clic sur une partie vide de la liste des messages entraine une exception
fixes #5158 Un message archivé peut être déplacé
[kmorin] fixes #5150 NPE au clic sur un noeud de l'arborescence
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building FaxToMail :: UI 0.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 28.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 28.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 31.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 30.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 66.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 60.7 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 61.1 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing ---
[INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-ui-swing ---
[INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey}
[INFO]
[INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing ---
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 58.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec)
[INFO] use project compile scope class-path
[INFO] Detects 26 modified jaxx file(s).
[INFO] Generated 26 file(s) in 4.623s
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing ---
[INFO] Load rules file validation.rules
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing ---
[INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 27/289 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing ---
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2…
[INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 62/536 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing ---
[INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> is up-to-date.
[INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO]
[INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-ui-swing ---
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Scan 1 file header done in 7.657ms.
[INFO] All files are up-to-date.
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 45 resources
[INFO] Copying 3 resources
[INFO] Copying 4 resources
[INFO]
[INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-ui-swing ---
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] Scan 171 files header done in 597.173ms.
[INFO]
* uptodate header on 143 files.
* add header on 28 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing ---
[INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Recompile with -Xlint:unchecked for details.
[INFO] 2 warnings
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown
[INFO] 1 error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
1
2
Jenkins build became unstable: faxtomail-ci » FaxToMail :: Service #91
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
by admin+ci-codelutin.com@codelutin.com 02 Jun '14
02 Jun '14
02 Jun '14
See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/87/changes>
Changes:
[echatellier] Refactoring de l'interface de configuration/folder/input
------------------------------------------
[...truncated 502 lines...]
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-ui-web ---
[INFO] No sources to compile
[INFO]
[INFO] --- maven-surefire-plugin:2.17:test (default-test) @ faxtomail-ui-web ---
[INFO] No tests to run.
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-war-plugin:2.4:war (default-war) @ faxtomail-ui-web ---
[INFO] Packaging webapp
[INFO] Assembling webapp [faxtomail-ui-web] in [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]>
[INFO] Processing war project
[INFO] Copying webapp webResources [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]> to [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]>
[INFO] Copying webapp resources [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]>
[INFO] Webapp assembled in [104 msecs]
[INFO] Building war: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ faxtomail-ui-web ---
[JENKINS] Archiving disabled
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building FaxToMail :: UI 0.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 50.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 46.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (7 KB at 248.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (7 KB at 302.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (57 KB at 1483.9 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 53.7 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (4 KB at 139.4 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (4 KB at 139.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 69.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 213.4 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 213.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 66.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 60.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 230.0 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 219.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.9 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (6 KB at 236.3 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (6 KB at 216.6 KB/sec)
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (73 KB at 1545.1 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (96 KB at 1425.8 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (385 KB at 3886.8 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (505 KB at 4271.6 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing ---
[INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing ---
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 51.9 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 50.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (4 KB at 160.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (4 KB at 168.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 60.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 194.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 194.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (401 KB at 4218.0 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (493 KB at 4978.5 KB/sec)
[INFO] use project compile scope class-path
[INFO] Detects 26 modified jaxx file(s).
[INFO] Generated 26 file(s) in 3.558s
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing ---
[INFO] Load rules file validation.rules
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing ---
[INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 27/287 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing ---
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/…
[INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2…
[INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing ---
[WARNING] bundle fr_FR contains 62/534 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing ---
[INFO]
[INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing ---
[INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> is up-to-date.
[INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 45 resources
[INFO] Copying 3 resources
[INFO] Copying 4 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing ---
[INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>: Recompile with -Xlint:unchecked for details.
[INFO] 2 warnings
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown
[INFO] 1 error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] FaxToMail ......................................... SUCCESS [ 1.896 s]
[INFO] FaxToMail :: Persistence .......................... SUCCESS [ 10.281 s]
[INFO] FaxToMail :: Service .............................. SUCCESS [ 7.547 s]
[INFO] FaxToMail :: Web .................................. SUCCESS [ 3.641 s]
[INFO] FaxToMail :: UI ................................... FAILURE [ 10.644 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 35.908 s
[INFO] Finished at: 2014-05-30T13:25:49+01:00
[INFO] Final Memory: 88M/1471M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure
[ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure
<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure
<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown
at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858)
at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
... 30 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :faxtomail-ui-swing
Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com
channel stopped
1
13
r125 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin@users.forge.codelutin.com 02 Jun '14
by kmorin@users.forge.codelutin.com 02 Jun '14
02 Jun '14
Author: kmorin
Date: 2014-06-02 23:06:54 +0200 (Mon, 02 Jun 2014)
New Revision: 125
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/125
Log:
find client for the incoming emails
Added:
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java
Modified:
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java
trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java
Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-06-02 20:34:14 UTC (rev 124)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-06-02 21:06:54 UTC (rev 125)
@@ -26,6 +26,7 @@
import com.franciaflex.faxtomail.FaxToMailConfiguration;
import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext;
+import com.franciaflex.faxtomail.services.service.ClientService;
import com.franciaflex.faxtomail.services.service.ConfigurationService;
import com.franciaflex.faxtomail.services.service.EmailService;
import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext;
@@ -82,4 +83,8 @@
public ReferentielService getReferentielService() {
return newService(ReferentielService.class);
}
+
+ public ClientService getClientService() {
+ return newService(ClientService.class);
+ }
}
Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java (rev 0)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-02 21:06:54 UTC (rev 125)
@@ -0,0 +1,74 @@
+package com.franciaflex.faxtomail.services.service;
+
+import com.franciaflex.faxtomail.persistence.entities.Client;
+import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao;
+import com.franciaflex.faxtomail.persistence.entities.MailFolder;
+import com.franciaflex.faxtomail.services.FaxToMailServiceSupport;
+import com.google.common.base.Function;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.nuiton.i18n.I18n.t;
+
+/**
+ * @author Kevin Morin (Code Lutin)
+ * @since x.x
+ */
+public class ClientService extends FaxToMailServiceSupport {
+
+ private static final Log log = LogFactory.getLog(ClientService.class);
+
+ public Client getClientForEmailAddress(String emailAddress, MailFolder folder) {
+ ClientTopiaDao clientDao = getPersistenceContext().getClientDao();
+
+ Client client = null;
+ List<Client> clients;
+ if (StringUtils.isNotBlank(emailAddress)) {
+ clients = clientDao.forEmailAddressEquals(emailAddress).findAll();
+
+ if (CollectionUtils.isEmpty(clients)) {
+ clients = clientDao.forFaxNumberEquals(emailAddress).findAll();
+ }
+
+ if (CollectionUtils.isNotEmpty(clients)) {
+ if (clients.size() == 1) {
+ client = clients.get(0);
+
+ } else if (folder != null) {
+ Multimap<String, Client> clientsByBrand = Multimaps.index(clients, new Function<Client, String>() {
+ @Override
+ public String apply(Client client) {
+ return client.getBrand();
+ }
+ });
+ Set<String> brands = clientsByBrand.keySet();
+ while (client == null && folder != null) {
+ if (brands.contains(folder.getName())) {
+ client = new ArrayList<>(clientsByBrand.get(folder.getName())).get(0);
+ }
+ folder = folder.getParent();
+ }
+ }
+ }
+ }
+ return client;
+ }
+
+ public Client getClientForCode(String code) {
+ ClientTopiaDao clientDao = getPersistenceContext().getClientDao();
+ Client client = null;
+ if (StringUtils.isNotBlank(code)) {
+ client = clientDao.forCodeEquals(code).findAnyOrNull();
+ }
+ return client;
+ }
+}
Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 20:34:14 UTC (rev 124)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 21:06:54 UTC (rev 125)
@@ -116,19 +116,19 @@
* @throws InvalidClientException if client code is not valid
*/
public Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException {
- return saveEmail(email, null, null, user, modifiedFields);
+ Client client = email.getClient();
+ return saveEmail(email, null, client != null ? client.getCode() : null, user, modifiedFields);
}
public Email saveEmail(Email email, Collection<Attachment> attachments, String clientCode, FaxToMailUser user, String... modifiedFields) throws InvalidClientException {
Date now = getNow();
- ClientTopiaDao clientDao = getPersistenceContext().getClientDao();
EmailTopiaDao dao = getPersistenceContext().getEmailDao();
HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao();
// if client code is null, do not manage client at all
Client client = null;
if (StringUtils.isNotBlank(clientCode)) {
- client = clientDao.forCodeEquals(clientCode).findAnyOrNull();
+ client = getClientService().getClientForCode(clientCode);
if (client == null) {
String message = t("faxtomail.service.email.save.clientCode.error", clientCode);
throw new InvalidClientException(message);
@@ -171,12 +171,14 @@
if (!attachment.isPersisted()) {
// persist using cascade
- currentAttachments.add(currentAttachment);
+ email.addAttachment(currentAttachment);
}
}
// delete not found attachments
- currentAttachments.removeAll(currentAttachmentIndex.values());
+ for (Attachment attachment : currentAttachmentIndex.values()) {
+ email.removeAttachment(attachment);
+ }
}
if (email.getRangeRow() != null) {
Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java
===================================================================
--- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-02 20:34:14 UTC (rev 124)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-02 21:06:54 UTC (rev 125)
@@ -55,6 +55,8 @@
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeUtility;
+import com.franciaflex.faxtomail.persistence.entities.Client;
+import com.franciaflex.faxtomail.services.service.ClientService;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -171,7 +173,6 @@
for (int i = 0 ; i < count ; i++) {
Email email = new EmailImpl();
- emailService.saveEmail(email, null);
int messageNumber = count - i;
Message message = folder.getMessage(messageNumber);
@@ -184,12 +185,6 @@
// email.s(message.getSubject());
// modifiedProperties.add(Email.PROPERTY_OBJECT);
- Address[] addresses = message.getFrom();
- if (addresses != null && addresses.length > 0) {
- email.setSender(addresses[0].toString());
- modifiedProperties.add(Email.PROPERTY_SENDER);
- }
-
List<Address> recipients = new ArrayList<>();
Address[] toRecipients = message.getRecipients(Message.RecipientType.TO);
if (toRecipients != null) {
@@ -214,7 +209,26 @@
break;
}
}
+ if (email.getMailFolder() == null) {
+ break;
+ }
+ emailService.saveEmail(email, null);
+ Address[] addresses = message.getFrom();
+ if (addresses != null && addresses.length > 0) {
+ String sender = addresses[0].toString();
+ email.setSender(sender);
+ modifiedProperties.add(Email.PROPERTY_SENDER);
+
+ Client client = serviceContext.newService(ClientService.class)
+ .getClientForEmailAddress(sender, email.getMailFolder());
+ //TODO kmorin 20140602 find the responsible's folder
+// if (client != null) {
+// client.getCustomerResponsible()
+// }
+ email.setClient(client);
+ }
+
Date receivedDate = message.getReceivedDate();
if (receivedDate == null) {
receivedDate = message.getSentDate();
1
0
r124 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/js
by echatellier@users.forge.codelutin.com 02 Jun '14
by echatellier@users.forge.codelutin.com 02 Jun '14
02 Jun '14
Author: echatellier
Date: 2014-06-02 22:34:14 +0200 (Mon, 02 Jun 2014)
New Revision: 124
Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/124
Log:
Correction de la sauvegarde des etats attente et mail folder cr?\195?\169?\195?\169s
Modified:
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java
trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java
trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java
trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-02 20:10:28 UTC (rev 123)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-02 20:34:14 UTC (rev 124)
@@ -32,6 +32,7 @@
import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.topia.persistence.TopiaIdFactory;
@@ -43,6 +44,7 @@
import com.franciaflex.faxtomail.persistence.entities.MailFilter;
import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao;
import com.franciaflex.faxtomail.persistence.entities.MailFolder;
+import com.franciaflex.faxtomail.persistence.entities.MailFolderImpl;
import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao;
import com.franciaflex.faxtomail.services.FaxToMailServiceSupport;
import com.google.common.collect.Lists;
@@ -101,15 +103,15 @@
}
Collection<MailFolder> result = Lists.newArrayList();
MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao();
- TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory();
+ //TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory();
Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class);
for (MailFolder mailFolder : mailFolders) {
Collection<MailFolder> children = saveMailFolders(mailFolder, mailFolder.getChildren());
MailFolder currentMailFolder;
- if (!factory.isTopiaId(mailFolder.getTopiaId())) {
- currentMailFolder = dao.create();
+ if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) {
+ currentMailFolder = new MailFolderImpl();
} else {
currentMailFolder = dao.findByTopiaId(mailFolder.getTopiaId());
}
Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java
===================================================================
--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-02 20:10:28 UTC (rev 123)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-02 20:34:14 UTC (rev 124)
@@ -106,20 +106,23 @@
for (EtatAttente etatAttente : etatAttentes) {
// get current etat attente
EtatAttente currentEtatAttente;
- if (StringUtils.isNoneBlank(etatAttente.getTopiaId())) {
+ if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) {
+ currentEtatAttente = new EtatAttenteImpl();
+ } else {
currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId());
- } else {
- currentEtatAttente = new EtatAttenteImpl();
}
// copy
- binderEtatAttente.copy(etatAttente, currentEtatAttente);
+ binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente,
+ EtatAttente.PROPERTY_TOPIA_ID,
+ EtatAttente.PROPERTY_TOPIA_CREATE_DATE,
+ EtatAttente.PROPERTY_TOPIA_VERSION);
// persist
if (currentEtatAttente.isPersisted()) {
+ etatAttenteDAO.update(currentEtatAttente);
+ } else {
etatAttenteDAO.create(currentEtatAttente);
- } else {
- etatAttenteDAO.update(currentEtatAttente);
}
}
Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java
===================================================================
--- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 20:10:28 UTC (rev 123)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 20:34:14 UTC (rev 124)
@@ -25,7 +25,6 @@
*/
import java.lang.reflect.Type;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:10:28 UTC (rev 123)
+++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:34:14 UTC (rev 124)
@@ -78,8 +78,8 @@
$scope.selectedEtatAttente = etatAttente;
// initialize le tableau d'action si vide
- if (!$scope.selectedEtatAttente.actions) {
- $scope.selectedEtatAttente.actions = [];
+ if (!$scope.selectedEtatAttente.mainActions) {
+ $scope.selectedEtatAttente.mainActions = [];
}
if (!$scope.selectedEtatAttente.fields) {
$scope.selectedEtatAttente.fields = [];
@@ -147,7 +147,8 @@
if (name) {
var newRoot = {
topiaId: "new_" + guid(),
- name: name
+ name: name,
+ children: []
};
$scope.mailFolders.push(newRoot);
@@ -167,8 +168,8 @@
if (!$scope.selectedMailFolder.replyAddresses) {
$scope.selectedMailFolder.replyAddresses = [];
}
- if (!$scope.selectedMailFolder.folderActions) {
- $scope.selectedMailFolder.folderActions = [];
+ if (!$scope.selectedMailFolder.contextActions) {
+ $scope.selectedMailFolder.contextActions = [];
}
if (!$scope.selectedMailFolder.folderTableColumns) {
$scope.selectedMailFolder.folderTableColumns = [];
@@ -203,6 +204,7 @@
var name = $window.prompt("Nom du nouveau noeud ? ");
if (name) {
nodeData.children.push({
+ topiaId: "new_" + guid(),
name: name,
children: []
});
1
0