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

r534 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/demande content/pdfeditor content/print content/transmit util
by kmorin＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: kmorin Date: 2014-08-12 18:46:21 +0200 (Tue, 12 Aug 2014) New Revision: 534 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/534 Log: fixes #5532 la fen?\195?\170tre d'ajout d'annotations ne contient pas les ?\195?\169l?\195?\169ments pour mettre en plein ?\195?\169cran/r?\195?\169duire facilement Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 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/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-08-12 16:46:21 UTC (rev 534) @@ -84,7 +84,7 @@ pdfEditorUIModel.fromEntity(attachment); pdfEditorUIModel.setDemand(getContext().getCurrentEmail()); - getHandler().openDialog(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); + getHandler().openModalFrame(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); pdfEditorUIModel.toEntity(attachment); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenDialogAction.java 2014-08-12 16:46:21 UTC (rev 534) @@ -36,20 +36,17 @@ */ public class SaveAndOpenDialogAction extends SaveDemandeAction { - protected boolean modal; protected FaxToMailUI dialogContent; protected String title; protected Dimension dimension; protected boolean takeDemand; public SaveAndOpenDialogAction(DemandeUIHandler handler, - boolean modal, FaxToMailUI dialogContent, String title, Dimension dimension, boolean takeDemand) { super(handler); - this.modal = modal; this.dialogContent = dialogContent; this.title = title; this.dimension = dimension; @@ -73,11 +70,6 @@ super.postSuccessAction(); DemandeUIHandler handler = getHandler(); - if (modal) { - handler.openDialog(dialogContent, title, dimension); - - } else { - handler.openFrame(dialogContent, title, dimension); - } + handler.openModalFrame(dialogContent, title, dimension); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-08-12 16:46:21 UTC (rev 534) @@ -39,11 +39,7 @@ @Override public void doAction() throws Exception { super.doAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); getActionEngine().runInternalAction(getContext().getMainUI().getHandler(), GoToPreviousScreenAction.class); } + } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-08-12 16:46:21 UTC (rev 534) @@ -86,4 +86,10 @@ } } } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + getHandler().closeFrame(); + } } 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-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -611,6 +611,6 @@ model.setDemandeUIModels(selectedEmails); MailFolderChooserUI dialogContent = new MailFolderChooserUI(ui, model); - openDialog(dialogContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500)); + openModalFrame(dialogContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500)); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -343,7 +343,6 @@ model.setDemandeUIModels(demandes); MailFolderChooserUI dialogContent = new MailFolderChooserUI(ui, model); SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(), - true, dialogContent, t("faxtomail.chooseMailFolder.title"), new Dimension(350, 500), @@ -365,7 +364,6 @@ boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction()); SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(), - true, dialogContent, t("faxtomail.chooseAttachmentToPrint.title"), new Dimension(350, 500), @@ -399,7 +397,6 @@ DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(), - false, dialogContent, t("faxtomail.reply.title", currentDemand.getTitle()), new Dimension(800, 600), @@ -414,7 +411,6 @@ SearchToGroupUI dialogContent = new SearchToGroupUI(ui); DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); SaveAndOpenDialogAction action = new SaveAndOpenDialogAction(demandeUI.getHandler(), - false, dialogContent, t("faxtomail.searchToGroup.title", demandeUI.getModel().getTitle()), getContext().getMainUI().getSize(), Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx 2014-08-12 16:46:21 UTC (rev 534) @@ -98,7 +98,7 @@ </JScrollPane> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' onActionPerformed='handler.closeDialog()'/> + <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> <JButton id='validateButton'/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -67,6 +67,7 @@ import com.franciaflex.faxtomail.ui.swing.actions.GenerateAnnotatedAttachmentAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; +import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.jaxx.application.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; @@ -88,7 +89,7 @@ * @author Kevin Morin (Code Lutin) * */ -public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIModel, PDFEditorUI> implements CloseableUI { +public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIModel, PDFEditorUI> implements CloseableUI, Cancelable { private static final Log log = LogFactory.getLog(PDFEditorUIHandler.class); @@ -620,4 +621,9 @@ demand.setHistory(email.getHistory()); } } + + @Override + public void cancel() { + closeFrame(); + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -140,7 +140,7 @@ @Override public void cancel() { - closeDialog(); + closeFrame(); } @Override @@ -157,8 +157,8 @@ false, false); getContext().getActionFactory().createUIAction(null, action).actionPerformed(null); - + showInformationMessage("faxtomail.print.success.message"); + closeFrame(); } - } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -143,7 +143,7 @@ @Override public void cancel() { - closeDialog(); + closeFrame(); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-12 16:46:21 UTC (rev 534) @@ -60,6 +60,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUIHandler; import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.apache.commons.logging.Log; @@ -265,26 +266,21 @@ } /** - * Surchargée pour temporairement ajouter un appel à ApplicationUI#onCloseUI on windowClosing. - * - * @deprecated overriden during waiting response for issue : http://nuiton.org/issues/3415 + * Open frame and disable parent frame */ - @Deprecated - @Override - public void openDialog(final ApplicationUI dialogContent, String title, Dimension dim) { - Component topestUI = getTopestUI(); - - final JDialog result; - if (topestUI instanceof Frame) { - result = new JDialog((Frame) topestUI, title, true); - } else { - result = new JDialog((Dialog) topestUI, title, true); + public void openModalFrame(final ApplicationUI dialogContent, String title, Dimension dim) { + JFrame result = getContext().getSecondaryFrame(); + if (result == null) { + result = new JFrame(); + result.setResizable(true); + getContext().setSecondaryFrame(result); } - result.add((Component) dialogContent); - result.setResizable(true); + final JFrame parentContainer = getParentContainer(JFrame.class); + parentContainer.setEnabled(false); - result.setSize(dim); + result.setTitle(title); + result.setContentPane((Container) dialogContent); final AbstractApplicationUIHandler handler = dialogContent.getHandler(); @@ -295,26 +291,31 @@ KeyStroke shortcutClosePopup = getContext().getConfiguration().getShortcutClosePopup(); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcutClosePopup, "close"); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + shortcutClosePopup, "close"); rootPane.getActionMap().put("close", new AbstractAction() { private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { - ((Cancelable) handler).cancel(); + ((org.nuiton.jaxx.application.swing.util.Cancelable) handler).cancel(); } }); } + SwingUtil.center(getContext().getMainUI(), result); + result.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); result.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - closeDialog(); + closeFrame(getContext().getSecondaryFrame(), handler); } @Override public void windowClosed(WindowEvent e) { + parentContainer.setEnabled(true); + Component ui = (Component) e.getSource(); if (log.isDebugEnabled()) { log.debug("Destroy ui " + ui); @@ -324,22 +325,11 @@ }); result.setSize(dim); - SwingUtil.center(topestUI, result); + result.setAlwaysOnTop(true); + SwingUtil.center(parentContainer, result); result.setVisible(true); } - @Override - public void closeDialog() { - JDialog dialog = getParentContainer(JDialog.class); - boolean canClose = true; - if (this instanceof CloseableUI) { - canClose = ((CloseableUI)this).quitUI(); - } - if (canClose) { - dialog.setVisible(false); - } - } - /** * Gros copier/coller de quitScreen() pour appeler runActionAndWait au lieu de saveAction.actionPerformed(null); par defaut * pour tenter de corriger un problème de concurrence entre l'action de sauvegarde de l'email @@ -394,9 +384,20 @@ } public void closeFrame() { - getParentContainer(JFrame.class).dispose(); + JFrame frame = getParentContainer(JFrame.class); + closeFrame(frame, this); } + protected void closeFrame(JFrame frame, AbstractApplicationUIHandler handler) { + boolean canClose = true; + if (this instanceof CloseableUI) { + canClose = ((CloseableUI) this).quitUI(); + } + if (canClose) { + frame.dispose(); + } + } + protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox, java.util.List<HL> values, java.util.List<HL> selection, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-12 16:40:45 UTC (rev 533) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-12 16:46:21 UTC (rev 534) @@ -161,31 +161,33 @@ boolean expanded, boolean leaf, int row, boolean hasFocus) { Component component = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); - FolderTreeNode node = (FolderTreeNode) value; - setEnabled(node.isCanSelect()); + if (FolderTreeNode.class.isAssignableFrom(value.getClass())) { + FolderTreeNode node = (FolderTreeNode) value; + setEnabled(node.isCanSelect()); - // En italic si l'utilsateur n'a pas le droit de lecture (sur un parent par exemple) - Font font = component.getFont(); - if (node.isCanRead()) { - font = font.deriveFont(Font.PLAIN); - } else { - font = font.deriveFont(Font.ITALIC); - } - component.setFont(font); + // En italic si l'utilsateur n'a pas le droit de lecture (sur un parent par exemple) + Font font = component.getFont(); + if (node.isCanRead()) { + font = font.deriveFont(Font.PLAIN); + } else { + font = font.deriveFont(Font.ITALIC); + } + component.setFont(font); - // Affichage en gris par defaut, mais en noir si le dossier est vraiment affecté - // à l'utilisateur - Color foreground; - if (!colorNotAffectedFolders - || context.getCurrentUser().isAffectedFoldersEmpty() - || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { + // Affichage en gris par defaut, mais en noir si le dossier est vraiment affecté + // à l'utilisateur + Color foreground; + if (!colorNotAffectedFolders + || context.getCurrentUser().isAffectedFoldersEmpty() + || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { - foreground = sel ? Color.WHITE : Color.BLACK; + foreground = sel ? Color.WHITE : Color.BLACK; - } else { - foreground = Color.GRAY; + } else { + foreground = Color.GRAY; + } + component.setForeground(foreground); } - component.setForeground(foreground); return component; }

1 0

r533 - trunk
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 18:40:45 +0200 (Tue, 12 Aug 2014) New Revision: 533 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/533 Log: Update gson Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-12 16:39:47 UTC (rev 532) +++ trunk/pom.xml 2014-08-12 16:40:45 UTC (rev 533) @@ -456,7 +456,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>2.3</version> <scope>compile</scope> </dependency>

1 0

r532 - in trunk: . faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/acti
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 18:39:47 +0200 (Tue, 12 Aug 2014) New Revision: 532 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/532 Log: Fix build Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-service/src/test/resources/log4j2.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java trunk/faxtomail-ui-web/src/main/resources/log4j2.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-08-12 16:39:47 UTC (rev 532) @@ -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% + */ + /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/pom.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -151,12 +151,6 @@  <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-08-12 16:39:47 UTC (rev 532) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.services.service.exceptions; +/* + * #%L + * FaxToMail :: Service + * $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.MailFolder; /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java 2014-08-12 16:39:47 UTC (rev 532) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.services.service.imports; +/* + * #%L + * FaxToMail :: Service + * $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.EmailImpl; /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java 2014-08-12 16:39:47 UTC (rev 532) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.services.service.imports; +/* + * #%L + * FaxToMail :: Service + * $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 java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-12 16:39:47 UTC (rev 532) @@ -67,6 +67,11 @@ protected FaxToMailUser currentUser; + static { + // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + } + protected Map<String, String> getDatabaseConfiguration(String dataBase) { Map<String, String> hibernateH2Config = new HashMap<String, String>(); Modified: trunk/faxtomail-service/src/test/resources/log4j2.xml =================================================================== --- trunk/faxtomail-service/src/test/resources/log4j2.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-service/src/test/resources/log4j2.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <Configuration> <Appenders> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-swing/pom.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -190,12 +190,6 @@  <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-12 16:39:47 UTC (rev 532) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%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.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <Configuration> <Appenders> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-web/pom.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -158,12 +158,6 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> 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-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java 2014-08-12 16:39:47 UTC (rev 532) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web.action.admin; +/* + * #%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 java.io.File; import java.io.FileInputStream; import java.io.InputStream; Modified: trunk/faxtomail-ui-web/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <Configuration> <Appenders> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-12 16:33:29 UTC (rev 531) +++ trunk/pom.xml 2014-08-12 16:39:47 UTC (rev 532) @@ -354,16 +354,8 @@ </dependency>  - <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4jVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <version>${log4jVersion}</version> <scope>runtime</scope>

1 0

r531 - trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 18:33:29 +0200 (Tue, 12 Aug 2014) New Revision: 531 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/531 Log: Fix test Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-12 16:19:49 UTC (rev 530) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-12 16:33:29 UTC (rev 531) @@ -143,6 +143,9 @@ PaginationParameter page = PaginationParameter.of(0, 7, Email.PROPERTY_RECEPTION_DATE, false); MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); + + // FIXME required for getEmailForFolder security check + cyril.setFolderReadable(true); PaginationResult<Email> page1 = service.getEmailForFolder(cyril, getCurrentUser(), page); Assert.assertEquals(10, page1.getCount());

1 0

r530 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 18:19:49 +0200 (Tue, 12 Aug 2014) New Revision: 530 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/530 Log: fixes #5620 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 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-08-12 16:07:27 UTC (rev 529) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-12 16:19:49 UTC (rev 530) @@ -179,7 +179,8 @@ @Override public void modelChanged(TableModel model) { - // do nothing + // do nothing, fix NPE + // see http://forge.codelutin.com/issues/5620 } };

1 0

r529 - in trunk: faxtomail-ui-swing/src/main/resources faxtomail-ui-web/src/main/resources
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 18:07:27 +0200 (Tue, 12 Aug 2014) New Revision: 529 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/529 Log: Move root log level to error Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-web/src/main/resources/log4j2.xml Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-08-12 15:59:54 UTC (rev 528) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml 2014-08-12 16:07:27 UTC (rev 529) @@ -23,7 +23,7 @@ <Logger name="com.franciaflex.faxtomail" level="info"/>  - <Root level="warn"> + <Root level="error"> <AppenderRef ref="Console" /> <AppenderRef ref="File" /> </Root> Modified: trunk/faxtomail-ui-web/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-08-12 15:59:54 UTC (rev 528) +++ trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-08-12 16:07:27 UTC (rev 529) @@ -27,7 +27,7 @@ <Logger name="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler" level="FATAL"/> <Logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="ERROR"/> - <Root level="warn"> + <Root level="error"> <AppenderRef ref="Console" />  </Root>

1 0

r528 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-service/src/test/resources faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/resources faxtomail-ui-web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web faxtomail-ui-web/src/main/resources
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 17:59:54 +0200 (Tue, 12 Aug 2014) New Revision: 528 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/528 Log: Move to log4j2 to allow using sys var in property files Added: trunk/faxtomail-service/src/test/resources/log4j2.xml trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/faxtomail-ui-web/src/main/resources/log4j2.xml Removed: trunk/faxtomail-service/src/test/resources/log4j.properties trunk/faxtomail-ui-swing/src/main/resources/log4j.properties trunk/faxtomail-ui-web/src/main/resources/log4j.properties Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-persistence/pom.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -112,28 +112,6 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - -  - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - -  - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - </dependencies> <build> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-service/pom.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -67,6 +67,11 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> + + <dependency> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -145,14 +150,20 @@  <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> Deleted: trunk/faxtomail-service/src/test/resources/log4j.properties =================================================================== --- trunk/faxtomail-service/src/test/resources/log4j.properties 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-service/src/test/resources/log4j.properties 2014-08-12 15:59:54 UTC (rev 528) @@ -1,29 +0,0 @@ -### -# #%L -# FaxToMail :: UI -# %% -# Copyright (C) 2014 Franciaflex -# %% -# 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% -### -log4j.rootCategory=ERROR, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %M %m%n - -# global level -log4j.logger.com.franciaflex.faxtomail.services.service=INFO Added: trunk/faxtomail-service/src/test/resources/log4j2.xml =================================================================== --- trunk/faxtomail-service/src/test/resources/log4j2.xml (rev 0) +++ trunk/faxtomail-service/src/test/resources/log4j2.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> + </Console> + </Appenders> + + <Loggers> + <Logger name="com.franciaflex.faxtomail.services.service" level="info"/> + + <Root level="error"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file Property changes on: trunk/faxtomail-service/src/test/resources/log4j2.xml ___________________________________________________________________ Added: svn:eol-style + native Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-swing/pom.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -188,16 +188,21 @@ </dependency>  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>runtime</scope> </dependency> 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-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-08-12 15:59:54 UTC (rev 528) @@ -26,12 +26,15 @@ import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailExceptionHandler; + import jaxx.runtime.SwingUtil; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.*; import javax.swing.plaf.BorderUIResource; + import java.awt.*; import java.io.IOException; import java.util.Arrays; @@ -55,6 +58,9 @@ log.info("Starting FaxToMail with arguments: " + Arrays.toString(args)); } + // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + // Create configuration FaxToMailConfiguration config = new FaxToMailConfiguration("faxToMail.properties", args); Deleted: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-08-12 15:59:54 UTC (rev 528) @@ -1,41 +0,0 @@ -### -# #%L -# FaxToMail :: UI -# %% -# Copyright (C) 2014 Franciaflex -# %% -# 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% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n - -# faxtomail levels -log4j.logger.com.franciaflex.faxtomail=INFO -log4j.logger.com.franciaflex.faxtomail.services=DEBUG - -#log4j.appender.file=org.apache.log4j.RollingFileAppender -#log4j.appender.file.file=${faxtomail.log.file} -#log4j.appender.file.MaxFileSize=10MB -#log4j.appender.file.MaxBackupIndex=4 - -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n -#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n 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-08-12 15:59:54 UTC (rev 528) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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"/> +  + + <Root level="warn"> + <AppenderRef ref="Console" /> + <AppenderRef ref="File" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file Property changes on: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml ___________________________________________________________________ Added: svn:eol-style + native Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-web/pom.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -47,9 +47,6 @@ <defaultWebContextPath>faxtomail</defaultWebContextPath> <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> -  - <slf4jJclScope>runtime</slf4jJclScope> - <devMode>true</devMode> <jsMinimize>false</jsMinimize> <jsCachePeriod>1</jsCachePeriod> @@ -162,17 +159,22 @@ <artifactId>gson</artifactId> </dependency> -  <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>${slf4jJclScope}</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>compile</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -386,14 +388,7 @@ </plugins> </build> -  <profiles> - <profile> - <id>removeSlf4jJclFromClasspath</id> - <properties> - <slf4jJclScope>provided</slf4jJclScope> - </properties> - </profile> <profile> <id>disable-devMode-release-profile</id> Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-08-12 15:59:54 UTC (rev 528) @@ -24,7 +24,6 @@ * #L% */ -import java.io.File; import java.util.HashMap; import java.util.Map; @@ -32,8 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.log4j.LogManager; -import org.apache.log4j.PropertyConfigurator; import org.nuiton.topia.flyway.TopiaFlywayService; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; @@ -103,7 +100,7 @@ // create application topiaApplicationContext = new FaxToMailTopiaApplicationContext(properties); - if (getApplicationConfig().isLogConfigurationProvided()) { + /*if (getApplicationConfig().isLogConfigurationProvided()) { File log4jConfigurationFile = getApplicationConfig().getLogConfigurationFile(); @@ -131,7 +128,7 @@ } else { log.info("will use default logging configuration"); - } + }*/ // I18nInitializer initializer = new DefaultI18nInitializer("faxtomail"); 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-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-08-12 15:59:54 UTC (rev 528) @@ -61,6 +61,9 @@ log.info("init FaxToMail web ui"); } + // TODO as of 20140812, hibernate fails to detect log4j 2.0, force slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + log.debug("scheduler launched"); ServletContext sc = sce.getServletContext(); Deleted: trunk/faxtomail-ui-web/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-08-12 15:59:54 UTC (rev 528) @@ -1,46 +0,0 @@ -### -# #%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% -### -log4j.rootCategory=WARN, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %M %m%n - -# global level -log4j.logger.com.franciaflex.faxtomail=INFO - -### persistence level -# log4j.logger.org.nuiton.topia=TRACE -# log4j.logger.com.franciaflex.faxtomail.persistence=TRACE - -### services level -# log4j.logger.com.franciaflex.faxtomail.services=TRACE - -### web level -#log4j.logger.com.franciaflex.faxtomail.web.FaxToMailInterceptor=WARN - -# annoying errors -log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL -log4j.logger.com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler=FATAL -log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack=ERROR Added: trunk/faxtomail-ui-web/src/main/resources/log4j2.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j2.xml (rev 0) +++ trunk/faxtomail-ui-web/src/main/resources/log4j2.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy/MM/dd HH:mm:ss} %5p (%c:%L) - %m%n" /> + </Console> + +  + </Appenders> + + <Loggers> + <Logger name="com.franciaflex.faxtomail" level="info"/> + +  + <Logger name="com.opensymphony.xwork2.interceptor.ParametersInterceptor" level="FATAL"/> + <Logger name="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler" level="FATAL"/> + <Logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="ERROR"/> + + <Root level="warn"> + <AppenderRef ref="Console" /> +  + </Root> + </Loggers> +</Configuration> \ No newline at end of file Property changes on: trunk/faxtomail-ui-web/src/main/resources/log4j2.xml ___________________________________________________________________ Added: svn:eol-style + native Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-12 15:01:33 UTC (rev 527) +++ trunk/pom.xml 2014-08-12 15:59:54 UTC (rev 528) @@ -118,6 +118,7 @@ <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> + <log4jVersion>2.0.1</log4jVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.3</commonsEmailVersion> @@ -226,7 +227,20 @@ <artifactId>hibernate-c3p0</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + </exclusion> + </exclusions> </dependency> + + <dependency> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.5-pre8</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -340,15 +354,31 @@ </dependency>  + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4jVersion}</version> + <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4jVersion}</version> + <scope>runtime</scope> + </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4jVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <artifactId>slf4j-api</artifactId> <version>${slf4jVersion}</version> </dependency>

1 0

r527 - in trunk: faxtomail-persistence/src/main/resources faxtomail-service/src/main/resources/db/migration
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 17:01:33 +0200 (Tue, 12 Aug 2014) New Revision: 527 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/527 Log: Move index queries to migration script Added: trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_520__add_performance_indexes.sql Removed: trunk/faxtomail-persistence/src/main/resources/important-indexes.sql Deleted: trunk/faxtomail-persistence/src/main/resources/important-indexes.sql =================================================================== --- trunk/faxtomail-persistence/src/main/resources/important-indexes.sql 2014-08-12 14:40:47 UTC (rev 526) +++ trunk/faxtomail-persistence/src/main/resources/important-indexes.sql 2014-08-12 15:01:33 UTC (rev 527) @@ -1,25 +0,0 @@ -CREATE INDEX email_receptionDate_idx ON email (receptionDate ASC); -CREATE INDEX email_archiveDate_idx ON email (archiveDate NULLS FIRST); -CREATE INDEX email_mailFolder_idx ON email (mailFolder); -CREATE INDEX email_demandStatus_idx ON email (demandStatus); - -CREATE INDEX email_takenBy_idx ON email(takenBy); -CREATE INDEX email_client_idx ON email(client); ---CREATE INDEX email_emailGroup_idx ON email(emailGroup); -CREATE INDEX email_etatAttente_idx ON email(etatAttente); -CREATE INDEX email_priority_idx ON email(priority); -CREATE INDEX email_demandType_idx ON email (demandType); - -CREATE INDEX demandType_fields_OWNER_idx ON demandType_fields (OWNER); ---CREATE INDEX rangeRow_email_idx ON rangeRow(email); -CREATE INDEX rangeRow_range_idx ON rangeRow(range); ---CREATE INDEX history_email_idx ON history(email); -CREATE INDEX history_faxToMailUser_idx ON history(faxToMailUser); -CREATE INDEX history_fields_OWNER_idx ON history_fields(OWNER); ---CREATE INDEX reply_email_idx ON reply(email); ---CREATE INDEX attachment_email_idx ON attachment(email); - - -CREATE INDEX mailfolder_readrightusers_readRightUsers_idx ON mailfolder_readrightusers(readRightUsers); -CREATE INDEX mailfolder_readrightgroups_readRightGroups_idx ON mailfolder_readrightgroups(readRightGroups); - Added: trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_520__add_performance_indexes.sql =================================================================== --- trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_520__add_performance_indexes.sql (rev 0) +++ trunk/faxtomail-service/src/main/resources/db/migration/V1_0_0_520__add_performance_indexes.sql 2014-08-12 15:01:33 UTC (rev 527) @@ -0,0 +1,18 @@ +CREATE INDEX email_receptionDate_idx ON email(receptionDate ASC); +CREATE INDEX email_archiveDate_idx ON email(archiveDate NULLS FIRST); +CREATE INDEX email_mailFolder_idx ON email(mailFolder); +CREATE INDEX email_demandStatus_idx ON email(demandStatus); + +CREATE INDEX email_takenBy_idx ON email(takenBy); +CREATE INDEX email_client_idx ON email(client); +CREATE INDEX email_etatAttente_idx ON email(etatAttente); +CREATE INDEX email_priority_idx ON email(priority); +CREATE INDEX email_demandType_idx ON email(demandType); + +CREATE INDEX demandType_fields_OWNER_idx ON demandType_fields(OWNER); +CREATE INDEX rangeRow_range_idx ON rangeRow(range); +CREATE INDEX history_faxToMailUser_idx ON history(faxToMailUser); +CREATE INDEX history_fields_OWNER_idx ON history_fields(OWNER); + +CREATE INDEX mailfolder_readrightusers_readRightUsers_idx ON mailfolder_readrightusers(readRightUsers); +CREATE INDEX mailfolder_readrightgroups_readRightGroups_idx ON mailfolder_readrightgroups(readRightGroups);

1 0

r526 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/reply util
by kmorin＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: kmorin Date: 2014-08-12 16:40:47 +0200 (Tue, 12 Aug 2014) New Revision: 526 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/526 Log: fixes #5626 [UI swing] Les bo?\195?\174tes de dialogue ne s'ouvrent pas sur le bon ?\195?\169cran Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-08-12 14:12:49 UTC (rev 525) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx 2014-08-12 14:40:47 UTC (rev 526) @@ -39,10 +39,6 @@ public ReplyFormUI(FaxToMailUI parentUI) { FaxToMailUIUtil.setParentUI(this, parentUI); - - // WFT echatellier 20140716 : aucune idée de ce à quoi ca sert, mais sinon ca fonctione pas - model = new ReplyFormUIModel(); - setContextValue(model); } ]]></script> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-12 14:12:49 UTC (rev 525) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-12 14:40:47 UTC (rev 526) @@ -69,7 +69,6 @@ import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.swing.ApplicationUI; import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; -import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.validator.bean.simple.SimpleBeanValidator; @@ -111,8 +110,7 @@ @Override public Component getTopestUI() { - ApplicationActionUI actionUI = getContext().getActionUI(); - return actionUI; + return getContext().getMainUI(); } public void clearValidators() { @@ -326,7 +324,7 @@ }); result.setSize(dim); - SwingUtil.center(getContext().getMainUI(), result); + SwingUtil.center(topestUI, result); result.setVisible(true); }

1 0

r525 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 12, 2014

Aug. 12, 2014

Author: echatellier Date: 2014-08-12 16:12:49 +0200 (Tue, 12 Aug 2014) New Revision: 525 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/525 Log: Remove lazy fetch and add fetch into hql Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-12 14:00:32 UTC (rev 524) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-12 14:12:49 UTC (rev 525) @@ -34,10 +34,19 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; -import org.apache.commons.lang3.tuple.Pair; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import com.google.common.base.Function; +import com.google.common.base.Objects; +import com.google.common.base.Splitter; +import com.google.common.base.Strings; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { /** @@ -50,7 +59,8 @@ */ public PaginationResult<Email> search(EmailFilter emailFilter, Set<MailFolder> readMailFolders, PaginationParameter pagination) { - StringBuilder query = new StringBuilder("FROM " + Email.class.getName() + " E"); + //StringBuilder query = new StringBuilder("FROM " + Email.class.getName() + " E"); + StringBuilder query = new StringBuilder(); Map<String, Object> args = new HashMap<>(); // apply security @@ -353,8 +363,39 @@ query.append(")"); } - // compute paginated - PaginationResult<Email> result = findPage(query.toString(), args, pagination); + // add same fecth liste as emailService#getEmailForFolder() + String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString(); + String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( + Email.PROPERTY_PRIORITY, + Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_CLIENT, + Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, + Email.PROPERTY_ETAT_ATTENTE, + Email.PROPERTY_TAKEN_BY, + Email.PROPERTY_REPLIES, + Email.PROPERTY_ATTACHMENT, + Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, + Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, + Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) + + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; + + // code copied from topia to perform search + PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination); + List<String> step1ResultTopiaIds = pageResult.getElements(); + + List<Email> sortedEntities; + if (CollectionUtils.isEmpty(step1ResultTopiaIds)) { + sortedEntities = Lists.newArrayList(); + } else { + Map<String, Object> step2Args = Maps.newHashMap(); + step2Args.put("topiaIdsForFetch_", step1ResultTopiaIds); + List<Email> entities = forHql(hqlForFetchStep2, step2Args).findAll(); + + sortedEntities = sortAccordingToIds(entities, step1ResultTopiaIds); + } + + PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); + //PaginationResult<Email> result = findPage(query.toString(), args, pagination); return result; } @@ -420,4 +461,72 @@ // params.put("emailIds", emailIds); // List<Pair<String, FaxToMailUser>> result = findAll(query, params); // } + + /** + * @deprecated beacause this need to be supported by topia (see http://forge.nuiton.org/issues/3427) + */ + @Deprecated + protected String addAllFecthes(String... fetchProperties) { + StringBuilder hqlFromClauseBuilder = new StringBuilder(); + //if (includeFetch) { + int fetchedPropertiesAliasIndex = 0; + Map<String, String> aliases = Maps.newHashMap(); + for (String propertyName : fetchProperties) { + + // addAllFetches("a.b").addAllFetches("i.j.k") will produce: + // left join topiaEntity_.a fetchedProp0_ left join fetch fetchedProp0_.b + // left join topiaEntity_.i fetchedProp1_ left join fetch fetchedProp1_.j fetchedProp2_ left join fetchedProp2_.k + + // addAllFetches("a.b").addAllFetches("a.c") will produce: + // left join topiaEntity_.a fetchedProp0_ left join fetch fetchedProp1_.b + // left join fetch fetchedProp1_.c + StringBuilder path = new StringBuilder(); // The path to reach the property + + // Loop over each part of the "a.b.c" + for (String part : Splitter.on('.').split(propertyName)) { + + // Look for the parent alias if already computed + String previousPath = path.toString(); + String previousAlias = Objects.firstNonNull(aliases.get(previousPath), "E"); + + // Compute the current path and look for its alias + if (path.length() > 0) { + path.append('.'); + } + path.append(part); + String currentPath = path.toString(); + String currentAlias = aliases.get(currentPath); + + // No current alias found, create and add it + if (Strings.isNullOrEmpty(currentAlias)) { + currentAlias = String.format("fetchedProp%d_", fetchedPropertiesAliasIndex++); + aliases.put(currentPath, currentAlias); + + String fetch = String.format(" LEFT JOIN FETCH %s.%s %s ", previousAlias, part, currentAlias); + hqlFromClauseBuilder.append(fetch); + } + } + } + //} + return hqlFromClauseBuilder.toString(); + } + + /** + * @deprecated beacause this need to be supported by topia (see http://forge.nuiton.org/issues/3427) + */ + @Deprecated + protected <O extends TopiaEntity> List<O> sortAccordingToIds(List<O> entities, final List<String> idsList) { + + // Cannot sort on second query, will sort according to the first result list + final Map<String, O> entitiesIndex = Maps.uniqueIndex(entities, TopiaEntities.getTopiaIdFunction()); + Iterable<O> transformed = Iterables.transform(idsList, new Function<String, O>() { + @Override + public O apply(String input) { + return entitiesIndex.get(input); + } + }); + + List<O> result = Lists.newArrayList(transformed); + return result; + } } 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-08-12 14:00:32 UTC (rev 524) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-12 14:12:49 UTC (rev 525) @@ -796,11 +796,6 @@ EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); PaginationResult<Email> result = emailDao.search(emailFilter, readMailFolders, pagination); - // Fetch lazy field for list display - for (Email email : result.getElements()) { - fetchEmailData(email); - } - return result; } @@ -1174,37 +1169,6 @@ } } - protected void fetchEmailData(Email email) { - if (email.getDemandType() != null) { - Hibernate.initialize(email.getDemandType().getFields()); - } - if (email.sizeRangeRow() > 0) { - for (RangeRow rangeRow : email.getRangeRow()) { - Hibernate.initialize(rangeRow.getRange()); - } - } - if (email.sizeHistory() > 0) { - for (History history : email.getHistory()) { - history.getType(); - Hibernate.initialize(history.getType()); - Hibernate.initialize(history.getFaxToMailUser()); - history.sizeFields(); - } - } - email.sizeReplies(); - email.sizeAttachment(); - - Hibernate.initialize(email.getTakenBy()); - Hibernate.initialize(email.getClient()); - Hibernate.initialize(email.getDemandStatus()); - - if (email.getEmailGroup() != null) { - email.getEmailGroup().sizeEmail(); - } - Hibernate.initialize(email.getEtatAttente()); - Hibernate.initialize(email.getPriority()); - } - /** * Compute mail folder path (separated by /) from root to current. *

1 0