Author: kmorin Date: 2014-09-29 17:02:51 +0200 (Mon, 29 Sep 2014) New Revision: 653 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/653 Log: - fix release build - correction import archives Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java 2014-09-29 14:21:28 UTC (rev 652) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java 2014-09-29 15:02:51 UTC (rev 653) @@ -1,5 +1,29 @@ 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% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-09-29 14:21:28 UTC (rev 652) +++ trunk/faxtomail-ui-swing/pom.xml 2014-09-29 15:02:51 UTC (rev 653) @@ -183,6 +183,11 @@ <artifactId>swingx-common</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + <!-- Logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css 2014-09-29 14:21:28 UTC (rev 652) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css 2014-09-29 15:02:51 UTC (rev 653) @@ -1,3 +1,26 @@ +/* + * #%L + * FaxToMail :: UI + * $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% + */ BeanFilterableComboBox, BeanComboBox { maximumRowCount: 20; } \ No newline at end of file Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java 2014-09-29 14:21:28 UTC (rev 652) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java 2014-09-29 15:02:51 UTC (rev 653) @@ -105,10 +105,7 @@ @Override public void validate() { - if (StringUtils.isEmpty(attachmentBase)) { - addActionError("Le répertoire de base des pièces jointes est obligatoire !"); - } - else if (!new File(attachmentBase).isDirectory()) { + if (StringUtils.isNotEmpty(attachmentBase) && !new File(attachmentBase).isDirectory()) { addActionError("Le répertoire de base des pièces jointes n'est pas un répertoire lisible !"); } if (archiveFile == null) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-29 14:21:28 UTC (rev 652) +++ trunk/pom.xml 2014-09-29 15:02:51 UTC (rev 653) @@ -350,6 +350,12 @@ </dependency> <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + <version>${swingXVersion}</version> + </dependency> + + <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId> <version>1.0.5</version>