- Faxtomail-commits - mailman.cloud.codelutin.com

r184 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by kmorin＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: kmorin Date: 2014-06-10 20:57:47 +0200 (Tue, 10 Jun 2014) New Revision: 184 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/184 Log: prise en compte de la configuration des actions du menu contextuel des dossiers Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 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/DemandeListUIModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-10 18:57:47 UTC (rev 184) @@ -37,12 +37,14 @@ actionIcon: compute; text: "faxtomail.demandeList.action.computeQuantitiesByRange"; toolTipText: "faxtomail.demandeList.action.computeQuantitiesByRange.tip"; + enabled: { model.isComputeQuantitiesByRangeEnabled() }; } #newDemandMenu { actionIcon: new-demand; text: "faxtomail.demandeList.action.newDemand"; toolTipText: "faxtomail.demandeList.action.newDemand.tip"; + enabled: { model.isNewDemandEnabled() }; } #demandNbLabel { 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-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-10 18:57:47 UTC (rev 184) @@ -31,6 +31,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.FolderAction; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryImpl; @@ -117,6 +118,16 @@ model.addPropertyChangeListener(DemandeListUIModel.PROPERTY_SELECTED_FOLDER, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { + MailFolder folder = (MailFolder) evt.getNewValue(); + while (folder.getParent() != null && !folder.isUseCurrentLevelFolderActions()) { + folder = folder.getParent(); + } + DemandeListUIModel model = getModel(); + model.setComputeQuantitiesByRangeEnabled(folder != null + && folder.containsFolderActions(FolderAction.COMPUTE_RANGE)); + model.setNewDemandEnabled(folder != null + && folder.containsFolderActions(FolderAction.NEW_DEMANDE)); + LoadFolderEmailsAction loadFolderEmailsAction = getContext().getActionFactory().createLogicAction(DemandeListUIHandler.this, LoadFolderEmailsAction.class); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-10 18:57:47 UTC (rev 184) @@ -46,6 +46,8 @@ public static final String PROPERTY_SAV_NB = "savNb"; public static final String PROPERTY_REPLY_ENABLED = "replyEnabled"; public static final String PROPERTY_ARCHIVE_ENABLED = "archiveEnabled"; + public static final String PROPERTY_COMPUTE_QUANTITIES_BY_RANGE_ENABLED = "computeQuantitiesByRangeEnabled"; + public static final String PROPERTY_NEW_DEMAND_ENABLED = "newDemandEnabled"; protected List<MailFolder> folders; @@ -61,6 +63,10 @@ protected boolean archiveEnabled; + protected boolean computeQuantitiesByRangeEnabled; + + protected boolean newDemandEnabled; + protected int quotationNb; protected int pfNb; @@ -160,12 +166,32 @@ return archiveEnabled; } - public void setArchiveEnabled(boolean qrchiveEnabled) { + public void setArchiveEnabled(boolean archiveEnabled) { Object oldValue = isArchiveEnabled(); this.archiveEnabled = archiveEnabled; firePropertyChange(PROPERTY_ARCHIVE_ENABLED, oldValue, archiveEnabled); } + public boolean isComputeQuantitiesByRangeEnabled() { + return computeQuantitiesByRangeEnabled; + } + + public void setComputeQuantitiesByRangeEnabled(boolean computeQuantitiesByRangeEnabled) { + Object oldValue = isComputeQuantitiesByRangeEnabled(); + this.computeQuantitiesByRangeEnabled = computeQuantitiesByRangeEnabled; + firePropertyChange(PROPERTY_COMPUTE_QUANTITIES_BY_RANGE_ENABLED, oldValue, computeQuantitiesByRangeEnabled); + } + + public boolean isNewDemandEnabled() { + return newDemandEnabled; + } + + public void setNewDemandEnabled(boolean newDemandEnabled) { + Object oldValue = isNewDemandEnabled(); + this.newDemandEnabled = newDemandEnabled; + firePropertyChange(PROPERTY_NEW_DEMAND_ENABLED, oldValue, newDemandEnabled); + } + public int getQuotationNb() { return quotationNb; } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 18:57:47 UTC (rev 184) @@ -92,22 +92,22 @@ try { - // schedule mail job (toutes les 20 minutes) + // schedule mail job (toutes les 5 minutes) Trigger trigger = TriggerBuilder .newTrigger() .withIdentity("mailFiltering", "mailFilteringTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 0/20 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/5 * * * ?")) .build(); Scheduler scheduler = new StdSchedulerFactory().getScheduler(); scheduler.start(); scheduler.scheduleJob(mailFilteringJob, trigger); - // schedule EDI job (toutes les 5 heures) + // schedule EDI job (toutes les 5 minutes) trigger = TriggerBuilder .newTrigger() .withIdentity("ediManagement", "ediManagementTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 0 0/5 * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/5 * * * ?")) .build(); scheduler = new StdSchedulerFactory().getScheduler();

1 0

r183 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-ui-swing faxtomail-ui-web
by maven-release＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: maven-release Date: 2014-06-10 11:29:34 +0200 (Tue, 10 Jun 2014) New Revision: 183 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/183 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-06-10 09:29:28 UTC (rev 182) +++ trunk/faxtomail-persistence/pom.xml 2014-06-10 09:29:34 UTC (rev 183) @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-10 09:29:28 UTC (rev 182) +++ trunk/faxtomail-service/pom.xml 2014-06-10 09:29:34 UTC (rev 183) @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:29:28 UTC (rev 182) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:29:34 UTC (rev 183) @@ -28,12 +28,12 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-ui-swing</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <name>FaxToMail :: UI</name> <properties> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:29:28 UTC (rev 182) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:29:34 UTC (rev 183) @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-10 09:29:28 UTC (rev 182) +++ trunk/pom.xml 2014-06-10 09:29:34 UTC (rev 183) @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name> @@ -71,9 +71,9 @@ </modules> <scm> - <url>https://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</url> - <connection>scm:svn:https://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</developerConnection> + <url>https://svn.codelutin.com/faxtomail/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/faxtomail/trunk</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/trunk</developerConnection> </scm> <distributionManagement> <site>

1 0

r182 - tags
by maven-release＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: maven-release Date: 2014-06-10 11:29:28 +0200 (Tue, 10 Jun 2014) New Revision: 182 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/182 Log: [maven-release-plugin] copy for tag faxtomail-0.1 Added: tags/faxtomail-0.1/

1 0

r181 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-ui-swing faxtomail-ui-web
by maven-release＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: maven-release Date: 2014-06-10 11:29:22 +0200 (Tue, 10 Jun 2014) New Revision: 181 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/181 Log: [maven-release-plugin] prepare release faxtomail-0.1 Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-06-10 09:25:38 UTC (rev 180) +++ trunk/faxtomail-persistence/pom.xml 2014-06-10 09:29:22 UTC (rev 181) @@ -21,13 +21,11 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-10 09:25:38 UTC (rev 180) +++ trunk/faxtomail-service/pom.xml 2014-06-10 09:29:22 UTC (rev 181) @@ -21,13 +21,11 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:25:38 UTC (rev 180) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:29:22 UTC (rev 181) @@ -21,21 +21,19 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-ui-swing</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> <name>FaxToMail :: UI</name> <properties> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:25:38 UTC (rev 180) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:29:22 UTC (rev 181) @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-10 09:25:38 UTC (rev 180) +++ trunk/pom.xml 2014-06-10 09:29:22 UTC (rev 181) @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.1</version> <packaging>pom</packaging> <name>FaxToMail</name> @@ -71,9 +71,9 @@ </modules> <scm> - <url>https://svn.codelutin.com/faxtomail/trunk</url> - <connection>scm:svn:https://svn.codelutin.com/faxtomail/trunk</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/trunk</developerConnection> + <url>https://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</url> + <connection>scm:svn:https://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/tags/faxtomail-0.1</developerConnection> </scm> <distributionManagement> <site>

1 0

r180 - trunk/faxtomail-ui-swing
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 11:25:38 +0200 (Tue, 10 Jun 2014) New Revision: 180 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/180 Log: Comment full bundles Modified: trunk/faxtomail-ui-swing/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:21:07 UTC (rev 179) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:25:38 UTC (rev 180) @@ -490,9 +490,9 @@ <descriptor> src/main/assembly/standalone.xml </descriptor> - <descriptor> +  </descriptors> </configuration> </execution> @@ -504,12 +504,12 @@ <profile> <id>prepare-full-release</id> - <activation> +  <properties> <redmine.releaseFiles> @@ -592,12 +592,12 @@ <profile> <id>linux-i586-bundle</id> - <activation> +  <build> <defaultGoal>package</defaultGoal> <plugins> @@ -658,12 +658,12 @@ <profile> <id>windows-i586-bundle</id> - <activation> +  <build> <defaultGoal>package</defaultGoal> <plugins> @@ -787,29 +787,5 @@ </plugins> </build> </profile> - -  -  - -  -  -  -  -  -  -  -  -  -  - -  - -  -  -  -  -  -  -  </profiles> </project> \ No newline at end of file

1 0

r179 - in trunk: faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print faxtomail-ui-web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 11:21:07 +0200 (Tue, 10 Jun 2014) New Revision: 179 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/179 Log: Fix build Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:14:56 UTC (rev 178) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:21:07 UTC (rev 179) @@ -285,11 +285,6 @@ <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> </dependencies>  Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-10 09:14:56 UTC (rev 178) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-10 09:21:07 UTC (rev 179) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.print; +/* + * #%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% + */ + import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import org.apache.commons.logging.Log; Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:14:56 UTC (rev 178) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-10 09:21:07 UTC (rev 179) @@ -47,9 +47,6 @@ <defaultWebContextPath>faxtomail</defaultWebContextPath> <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> -  - <skipPostRelease>false</skipPostRelease> -  <slf4jJclScope>runtime</slf4jJclScope> </properties> @@ -130,6 +127,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-06-10 09:14:56 UTC (rev 178) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java 2014-06-10 09:21:07 UTC (rev 179) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web; +/* + * #%L + * FaxToMail :: Web + * $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.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor;

1 0

r178 - trunk/faxtomail-ui-swing
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 11:14:56 +0200 (Tue, 10 Jun 2014) New Revision: 178 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/178 Log: Fix deps Modified: trunk/faxtomail-ui-swing/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:09:58 UTC (rev 177) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-10 09:14:56 UTC (rev 178) @@ -286,6 +286,10 @@ <artifactId>activation</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> </dependencies>

1 0

r177 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 11:09:58 +0200 (Tue, 10 Jun 2014) New Revision: 177 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/177 Log: Bug fixes Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-10 08:43:21 UTC (rev 176) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-10 09:09:58 UTC (rev 177) @@ -114,6 +114,8 @@ MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); int position = 0; + List<MailFilter> filters = dao.findAll(); + Map<String, MailFilter> filterById = new HashMap<>(Maps.uniqueIndex(filters, TopiaEntities.getTopiaIdFunction())); for (MailFilter mailFilter : mailFilters) { MailFilter filter; @@ -121,7 +123,7 @@ if (create) { filter = dao.newInstance(); } else { - filter = dao.findByTopiaId(mailFilter.getTopiaId()); + filter = filterById.remove(mailFilter.getTopiaId()); } filter.setExpression(mailFilter.getExpression()); filter.setMailFolder(mailFilter.getMailFolder()); @@ -135,6 +137,9 @@ position++; } + + dao.deleteAll(filterById.values()); + getPersistenceContext().commit(); } /** 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-10 08:43:21 UTC (rev 176) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-10 09:09:58 UTC (rev 177) @@ -346,7 +346,7 @@ Définir le dossier de dépôt des demandes EDI sur le serveur :</label> <div class="input-group" ng-if="selectedMailFolder.useCurrentLevelEdiFolder || !selectedMailFolder.$parent"> <input type="text" class="form-control" ng-model="selectedMailFolder.ediFolder"> - <span class="input-group-addon btn btn-info" ng-disabled="selectedMailFolder.ediFolder" + <span class="input-group-addon btn btn-info" ng-disabled="!selectedMailFolder.ediFolder" tooltip="Fonctionnalité à venir"> <i class="fa fa-cogs"></i> Test </span> @@ -838,7 +838,7 @@ </div> <div id="tabs-search" class="tab-pane" ng-controller="ConfigurationSearchController"> - <input type="hidden" name="configuration.searchDisplayColumns" value="{{searchDisplayColumn.id}}" ng-repeat="searchDisplayColumn in searchDisplayColumns"/> +  <div class="control-group"> <label class="control-label" for="tableColumns">Champs à afficher dans le tableau (l'ordre peut être changé en faisant un glisser/déposer sur les champs)</label> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-10 08:43:21 UTC (rev 176) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-10 09:09:58 UTC (rev 177) @@ -866,11 +866,22 @@ function($scope, ConfigurationData) { //{Array} Options actuelle $scope.searchDisplayColumns = []; - angular.forEach(ConfigurationData.searchDisplayColumns, function(searchDisplayColumn) { - $scope.searchDisplayColumns.push({ - id: searchDisplayColumn, - label: $scope.fields[searchDisplayColumn] + if ($scope.configuration.searchDisplayColumns) { + angular.forEach($scope.configuration.searchDisplayColumns, function(searchDisplayColumn) { + $scope.searchDisplayColumns.push({ + id: searchDisplayColumn, + label: $scope.mailFields[searchDisplayColumn] + }); }); + } + + $scope.$watch("searchDisplayColumns", function(newValue, oldValue) { + if (newValue) { + $scope.configuration.searchDisplayColumns = []; + angular.forEach(newValue, function(elem) { + $scope.configuration.searchDisplayColumns.push(elem.id); + }); + } }); // fonction retournant l'ensemble des options disponibles

1 0

r176 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:43:21 +0200 (Tue, 10 Jun 2014) New Revision: 176 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/176 Log: Fix quartz cron synthax (with seconds) Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:32:56 UTC (rev 175) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 08:43:21 UTC (rev 176) @@ -96,27 +96,24 @@ Trigger trigger = TriggerBuilder .newTrigger() .withIdentity("mailFiltering", "mailFilteringTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0/20 * * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/20 * * * ?")) .build(); Scheduler scheduler = new StdSchedulerFactory().getScheduler(); - //scheduler.start(); + scheduler.start(); scheduler.scheduleJob(mailFilteringJob, trigger); - // schedule EDI job (toutes les 5 heures)s + // schedule EDI job (toutes les 5 heures) trigger = TriggerBuilder .newTrigger() .withIdentity("ediManagement", "ediManagementTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("* 0/5 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0 0/5 * * ?")) .build(); - //scheduler = new StdSchedulerFactory().getScheduler(); - //scheduler.start(); + scheduler = new StdSchedulerFactory().getScheduler(); + scheduler.start(); scheduler.scheduleJob(ediManagementJob, trigger); - // start scheduler - scheduler.start(); - log.debug("schedulers launched"); } catch (SchedulerException e) {

1 0

r175 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

Author: echatellier Date: 2014-06-10 10:32:56 +0200 (Tue, 10 Jun 2014) New Revision: 175 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/175 Log: Fix attachment fileName 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-10 08:20:56 UTC (rev 174) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-10 08:32:56 UTC (rev 175) @@ -364,7 +364,7 @@ Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(false); AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); - attachmentFile.setFilename(dh.getName()); + attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); //email.addAttachment(attachment);

1 0