r657 - in trunk: . faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing faxtomail-ui-swing/src/license faxtomail-ui-swing/src/main faxtomail-ui-swing/src/main/filtered-resources faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/main/resources faxtomail-ui-sw
Author: kmorin Date: 2014-10-01 15:36:24 +0200 (Wed, 01 Oct 2014) New Revision: 657 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/657 Log: - ajout du splash screen - ajout du a propos - correction de la g?\195?\169n?\195?\169ration du fichier edi Added: trunk/faxtomail-ui-swing/src/main/filtered-resources/ trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg Removed: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/pom.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-01 13:36:24 UTC (rev 657) @@ -460,6 +460,7 @@ // changement du status email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } else { // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, @@ -553,8 +554,8 @@ ediWriter.write("OARFAX" + separator); //03/Date traitement/Date/6/JJMMAA dte système ediWriter.write(DateFormatUtils.format(now, "ddMMyy") + separator); - //04/Date livraison prévue/Date/6/JJMMAA dte système - ediWriter.write(DateFormatUtils.format(now, "ddMMyy") + separator); + //04/Date livraison prévue/Date/6/JJMMAA dte de réception + ediWriter.write(DateFormatUtils.format(email.getReceptionDate(), "ddMMyy") + separator); //05/Commentaire/Alpha/70/Vide ediWriter.write(separator); //06/Commentaire/Alpha/70/Vide @@ -598,7 +599,7 @@ //26/Code Ean fournisseur/Alpha/13/Gamme ediWriter.write(rangeRow.getRange().getLabel() + separator); //27/Identifiant Unique - ediWriter.write(rangeRow.getRange().getTopiaId() + "\n"); + ediWriter.write(rangeRow.getTopiaId() + "\n"); ediWriter.write("%END_ENTETE_QUOTE\n"); Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/pom.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -158,6 +158,11 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> @@ -261,22 +266,21 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> + <filtering>true</filtering> <includes> <include>*.config</include> <include>*.properties</include> </includes> - <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>*.config</exclude> - <exclude>*.properties</exclude> - </excludes> - <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> </resource> </resources> + <plugins> <plugin> Modified: trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/license/THIRD-PARTY.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -1,36 +1,48 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License +# - CDDL # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License, Version 1.0 # - GNU Affero General Public License v3 +# - GNU GENERAL PUBLIC LICENSE version 2 or higher # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License version 2 (GPLv2) # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser General Public License version 2.1 (LGPLv2.1) # - GNU Lesser General Public License, Version 2.1 -# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License +# - GPLv2+CE # - General Public License (GPL) +# - LGPL # - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - MPL 1.1 +# - Modified BSD License # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt +# - UnboundID LDAP SDK Free Use License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Mar 24 15:58:44 CET 2014 +#Wed Oct 01 15:25:35 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -#to check javax.media.jai--com.springsource.javax.media.jai.codec--1.1.3=Apache License javax.media.jai--com.springsource.javax.media.jai.core--1.1.3=Apache License +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 Copied: trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties (from rev 656, trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config) =================================================================== --- trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties (rev 0) +++ trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,4 @@ +faxtomail.version=${project.version} +faxtomail.site.url=${project.url} +faxtomail.inceptionYear=${project.inceptionYear} +faxtomail.organizationName=${license.organizationName} \ No newline at end of file Property changes on: trunk/faxtomail-ui-swing/src/main/filtered-resources/faxToMail.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-10-01 13:36:24 UTC (rev 657) @@ -31,12 +31,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.widgets.extra.SplashScreen; import javax.swing.*; import javax.swing.plaf.BorderUIResource; +import javax.swing.plaf.FontUIResource; import java.awt.*; +import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; /** @@ -62,44 +66,71 @@ FaxToMailConfiguration config = new FaxToMailConfiguration("faxToMail.properties", args); - // Create application context - FaxToMailUIContext context = FaxToMailUIContext.newContext(config); + Font font; + try { + InputStream fontStream = RunFaxToMail.class.getResourceAsStream("/PoetsenOne-Regular.ttf"); + font = FontUIResource.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(30f); - // override default exception management (after config init) - Thread.setDefaultUncaughtExceptionHandler(new FaxToMailExceptionHandler(context.getErrorHelper())); - // See http://forge.codelutin.com/issues/2055 - //System.setProperty("sun.awt.exception.handler", TuttiExceptionHandler.class.getName()); - - // prepare context (mainly init configs, i18n) - context.init(); - - // Prepare ui look&feel and load ui properties - try { - SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { - // could not find nimbus look-and-feel - if (log.isWarnEnabled()) { - log.warn("Failed to init nimbus look and feel", e); + if (log.isErrorEnabled()) { + log.error("error while loading font, use the default one", e); } + font = new Font("Verdana", Font.BOLD, 20); } + SplashScreen.Title title = new SplashScreen.Title("FaxToMail " + config.getVersion(), + font, + new Point(20, 40), + new Color(200, 20, 40)); + final SplashScreen splashScreen = new SplashScreen("/splashscreen.jpg", title); + splashScreen.setRemanence(500); - boolean reload = false; + try { + // Create application context + FaxToMailUIContext context = FaxToMailUIContext.newContext(config); - if (config.isFullLaunchMode()) { + // override default exception management (after config init) + Thread.setDefaultUncaughtExceptionHandler(new FaxToMailExceptionHandler(context.getErrorHelper())); + // See http://forge.codelutin.com/issues/2055 + //System.setProperty("sun.awt.exception.handler", TuttiExceptionHandler.class.getName()); - if (log.isInfoEnabled()) { - log.info("Full launch mode, try to update."); + // prepare context (mainly init configs, i18n) + context.init(); + + // Prepare ui look&feel and load ui properties + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + if (log.isWarnEnabled()) { + log.warn("Failed to init nimbus look and feel", e); + } } - } + boolean reload = false; - if (!reload) { - if (log.isInfoEnabled()) { - log.info("Will start FaxToMail..."); + if (config.isFullLaunchMode()) { + + if (log.isInfoEnabled()) { + log.info("Full launch mode, try to update."); + } + } - startFaxToMail(context, true); + + if (!reload) { + if (log.isInfoEnabled()) { + log.info("Will start FaxToMail..."); + } + startFaxToMail(context, true); + } + + } finally { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + splashScreen.complete(); + } + }); } - } public static void startFaxToMail(FaxToMailUIContext context, boolean openContext) { Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,69 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; +import jaxx.runtime.swing.AboutPanel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import java.util.Calendar; + +import static org.nuiton.i18n.I18n.t; + +/** + * To show about panel. + * + * @author Kevin Morin + */ +public class ShowAboutAction extends AbstractMainUIFaxToMailAction { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ShowAboutAction.class); + + protected AboutPanel about; + + public ShowAboutAction(MainUIHandler handler) { + super(handler, false); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + about.showInDialog(getUI(), true); + } + + @Override + public void doAction() throws Exception { + + about = null; + + String name = "faxtomail"; + String licensePath = "META-INF/" + name + "-LICENSE.txt"; + String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; + + about = new AboutPanel(); + about.setTitle(t("faxtomail.about.title")); + about.setAboutText(t("faxtomail.about.message")); + + FaxToMailConfiguration config = getConfig(); + int currentYear = Calendar.getInstance().get(Calendar.YEAR); + int inceptionYear = config.getInceptionYear(); + String years; + if (currentYear != inceptionYear) { + years = inceptionYear + "-" + currentYear; + } else { + years = inceptionYear + ""; + } + + about.setBottomText(t("faxtomail.about.bottomText", + config.getOrganizationName(), + years, + config.getVersion())); + about.setLicenseFile(licensePath); + about.setThirdpartyFile(thirdPartyPath); + about.buildTopPanel(); + + about.init(); + } + +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-10-01 13:36:24 UTC (rev 657) @@ -64,6 +64,12 @@ _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.CloseApplicationAction.class}; } +#aboutButton { + actionIcon: about; + toolTipText: "faxtomail.main.action.about.tip"; + _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowAboutAction.class}; +} + #bottomBar { floatable: false; margin: {new java.awt.Insets(0, 0, 0, 5)}; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-10-01 13:36:24 UTC (rev 657) @@ -57,6 +57,7 @@ <JToolBar id='bottomBar'> <SwingValidatorMessageWidget id='validatorMessageWidget'/> + <JButton id='aboutButton'/> </JToolBar> <JXTitledPanel id='body' constraints='BorderLayout.CENTER' decorator='boxed'/> Added: trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/PoetsenOne-Regular.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-10-01 13:36:24 UTC (rev 657) @@ -1,4 +0,0 @@ -faxtomail.version=${project.version} -faxtomail.site.url=${project.url} -faxtomail.inceptionYear=${project.inceptionYear} -faxtomail.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-10-01 13:36:24 UTC (rev 657) @@ -4,6 +4,9 @@ \:= application.action.create.error= application.error.ui.business.warning= +faxtomail.about.bottomText=Copyright %s - %s - version %s +faxtomail.about.message=<h3>FaxToMail</h3><p><strong>Outil de gestion d'emails.</strong></p><br/><p>Ce logiciel permet de router les emails reçus vers des dossiers et de les transformer en formulaires. Ils peuvent être déplacés entre dossiers pour êtres remplis par différentes personnes puis archivés.</p><p>Ce projet a été initiée en 2014 par le groupe MAC et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://doc.codelutin.com/faxtomail">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/faxtomail">Forge.codelutin.com</a>.</p> +faxtomail.about.title=À propos de FaxToMail faxtomail.action.archive.tip=Archiver l'élément faxtomail.action.attachment.edit.tip=Edition du fichier %s faxtomail.action.attachment.open.tip=Ouverture du fichier %s @@ -216,6 +219,8 @@ faxtomail.historyList.action.tip=Historique faxtomail.historyList.text=Historique (%s) faxtomail.historyList.title=Historique +faxtomail.main.action.about=À propos +faxtomail.main.action.about.tip=À propos faxtomail.main.action.demandeList=Gestion des fax faxtomail.main.action.demandeList.tip=Gestion des fax faxtomail.main.action.exit=Quitter Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%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% - --> - -<Configuration> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> - </Console> - - <RollingFile name="File" fileName="${sys:user.home}/.faxtomail/faxtomail.log" - filePattern="${sys:user.home}/.faxtomail/faxtomail-%d{yyyyMMdd}-%i.log"> - <PatternLayout> - <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n</pattern> - </PatternLayout> - <Policies> - <TimeBasedTriggeringPolicy /> - <SizeBasedTriggeringPolicy size="10 MB"/> - </Policies> - <DefaultRolloverStrategy max="5"/> - </RollingFile> - </Appenders> - - <Loggers> - <Logger name="com.franciaflex.faxtomail" level="info"/> - <!-- <Logger name="com.franciaflex.faxtomail.services" level="debug"/> --> - - <Root level="error"> - <AppenderRef ref="Console" /> - <AppenderRef ref="File" /> - </Root> - </Loggers> -</Configuration> \ No newline at end of file Added: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + FaxToMail :: UI + $Id: log4j2.xml 532 2014-08-12 16:39:47Z echatellier $ + $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-swing/src/main/resour... $ + %% + 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% + --> + +<Configuration> + + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> + </Console> + + <RollingFile name="File" fileName="${sys:user.home}/.faxtomail/faxtomail.log" + filePattern="${sys:user.home}/.faxtomail/faxtomail-%d{yyyyMMdd}-%i.log"> + <PatternLayout> + <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n</pattern> + </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy /> + <SizeBasedTriggeringPolicy size="10 MB"/> + </Policies> + <DefaultRolloverStrategy max="5"/> + </RollingFile> + </Appenders> + + <Loggers> + <Logger name="com.franciaflex.faxtomail" level="info"/> + <!-- <Logger name="com.franciaflex.faxtomail.services" level="debug"/> --> + + <Root level="error"> + <AppenderRef ref="Console" /> + <AppenderRef ref="File" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file Added: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/splashscreen.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-30 17:12:03 UTC (rev 656) +++ trunk/pom.xml 2014-10-01 13:36:24 UTC (rev 657) @@ -331,6 +331,12 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> <version>${jaxxVersion}</version> </dependency>
participants (1)
-
kmorin@users.forge.codelutin.com