October 2009 - Lima-commits - mailman.cloud.codelutin.com

r2718 - in trunk/lima-main/src/main: java/org/chorem/lima/imports java/org/chorem/lima/ui resources/i18n
by fdesbois＠users.chorem.org Oct. 15, 2009

Oct. 15, 2009

Author: fdesbois Date: 2009-10-14 17:41:51 +0200 (Wed, 14 Oct 2009) New Revision: 2718 Modified: trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties Log: Problem when default_pcg.xml is in jar : change XMLImport method to take InputStream Modified: trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java 2009-10-14 14:02:42 UTC (rev 2717) +++ trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java 2009-10-14 15:41:51 UTC (rev 2718) @@ -111,6 +111,15 @@ return result; } + public String importAccount(InputStream stream) { + if (log.isDebugEnabled()) { + log.debug("Load Account XML "); + } + // Chargement du fichier + LoadFile(stream, InputStream.class); + return importAccount(); + } + /** * Import Account * @param file @@ -121,12 +130,15 @@ if (log.isDebugEnabled()) { log.debug("Load Account XML "); } + LoadFile(file, String.class); + return importAccount(); + } + + private String importAccount() { // Variables - accountServ = Main.getContext().getDataManager().getAccountModel(); + accountServ = Main.getContext().getDataManager().getAccountModel(); String result = ServiceHelper.RESPOND_ERROR; boolean existError = false; - // Chargement du fichier - LoadFile(file); try { // Recherche de la racine racine = document.getRootElement(); @@ -143,7 +155,7 @@ String label = noeudCourant.getAttribute("label").getValue(); String accountNumber = noeudCourant.getAttribute("accountNumber").getValue(); String masterAccount = noeudCourant.getAttribute("masterAccount").getValue(); - String type = noeudCourant.getAttribute("type").getValue(); + String type = noeudCourant.getAttribute("type").getValue(); // Création bdd // Si il n'a pas de compte père, alors on rattache le compte au compte '0' master. if ( masterAccount.equals("0") ) @@ -184,12 +196,14 @@ return result; } - + private void LoadFile(String file) { + LoadFile(file, String.class); + } /** * * @param file */ - private void LoadFile (String file) + private <T> void LoadFile(T file, Class<T> fileClass) { /** * Chargement du fichier et construction du Dom @@ -200,7 +214,11 @@ try { /* On crée une instance de SAXBuilder */ SAXBuilder sxb = new SAXBuilder(); - document = sxb.build(file); + if (fileClass.equals(String.class)) { + document = sxb.build((String)file); + } else if (fileClass.equals(InputStream.class)){ + document = sxb.build((InputStream)file); + } } catch (IOException e) { log.error("Erreur lors de la lecture du fichier " + e.getMessage() ); Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-10-14 14:02:42 UTC (rev 2717) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-10-14 15:41:51 UTC (rev 2718) @@ -19,6 +19,7 @@ package org.chorem.lima.ui; +import java.io.IOException; import java.net.URL; import javax.swing.JOptionPane; import static org.nuiton.i18n.I18n._; @@ -58,7 +59,14 @@ } public void loadDefaultAccount(AccountDTO accountRoot) { + if (log.isDebugEnabled()) { + log.debug("Account root : " + accountRoot); + } if (accountRoot.getChildren().isEmpty()) { + if (log.isDebugEnabled()) { + log.debug("No existing accounts"); + } + String[] response = {_("lima.response.yes"), _("lima.response.no")}; int n = JOptionPane.showOptionDialog(this, _("lima.question.load.accounts"), @@ -71,7 +79,11 @@ if (n == JOptionPane.YES_OPTION) { XMLImport imports = new XMLImport(); URL urlFile = ProgressBarImpl.class.getResource("/import/default_pcg.xml"); - imports.importAccount(urlFile.getFile()); + try { + imports.importAccount(urlFile.openStream()); + } catch (IOException eee) { + log.error("Erreur chargement du fichier 'default_pcg.xml'", eee); + } } else { Main.getContext().getDataManager().resetAccountModel(); } Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-10-14 14:02:42 UTC (rev 2717) +++ trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-10-14 15:41:51 UTC (rev 2718) @@ -93,6 +93,8 @@ lima.error.account.not.master=Ce compte ne poss\u00E8de pas de compte principal lima.error.account.with.entries=Ce compte poss\u00E8de des entr\u00E9es comptables lima.error.at.least.one.criteria=Au moins un crit\u00E8re doit +lima.error.entry.not.exist= +lima.error.entry.not.remove= lima.error.journal.double=Un journal poss\u00E8de d\u00E9j\u00E0 ce nom lima.error.journal.not.exist=Ce journal n'existe pas lima.error.journal.with.transactions=Ce journal poss\u00E8de des transactions comptables

3 2

r2719 - trunk/lima-main/src/main/java/org/chorem/lima/imports
by fdesbois＠users.chorem.org Oct. 15, 2009

Oct. 15, 2009

Author: fdesbois Date: 2009-10-15 10:35:29 +0200 (Thu, 15 Oct 2009) New Revision: 2719 Modified: trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java Log: Rename method LoadFile in loadFile Modified: trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java 2009-10-14 15:41:51 UTC (rev 2718) +++ trunk/lima-main/src/main/java/org/chorem/lima/imports/XMLImport.java 2009-10-15 08:35:29 UTC (rev 2719) @@ -73,7 +73,7 @@ String result = ServiceHelper.RESPOND_ERROR; boolean existError = false; // Chargement du fichier - LoadFile(file); + loadFile(file); try { // Recherche de la racine racine = document.getRootElement(); @@ -116,7 +116,7 @@ log.debug("Load Account XML "); } // Chargement du fichier - LoadFile(stream, InputStream.class); + loadFile(stream, InputStream.class); return importAccount(); } @@ -130,7 +130,7 @@ if (log.isDebugEnabled()) { log.debug("Load Account XML "); } - LoadFile(file, String.class); + loadFile(file); return importAccount(); } @@ -196,14 +196,14 @@ return result; } - private void LoadFile(String file) { - LoadFile(file, String.class); + private void loadFile(String file) { + loadFile(file, String.class); } /** * * @param file */ - private <T> void LoadFile(T file, Class<T> fileClass) + private <T> void loadFile(T file, Class<T> fileClass) { /** * Chargement du fichier et construction du Dom

1 0

r2717 - in trunk/lima-main/src/main: java/org/chorem/lima java/org/chorem/lima/ui resources/i18n resources/import
by fdesbois＠users.chorem.org Oct. 14, 2009

Oct. 14, 2009

Author: fdesbois Date: 2009-10-14 16:02:42 +0200 (Wed, 14 Oct 2009) New Revision: 2717 Added: trunk/lima-main/src/main/resources/import/default_pcg.xml Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties Log: Resolve #57 : popup on startup when no existing accounts in database (import default_pcg.xml) Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-10-14 12:55:29 UTC (rev 2716) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-10-14 14:02:42 UTC (rev 2717) @@ -32,6 +32,7 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.DateConverter; +import org.chorem.lima.tree.model.AccountTreeTableModel; import org.chorem.lima.ui.MainViewImpl; import org.nuiton.i18n.I18n; import org.nuiton.util.ConverterUtil; @@ -174,7 +175,9 @@ // Chargement des comptes b.getProgressBar().setString("30% : "+_("lima.progressBar.load.etape2")); b.getProgressBar().setValue(30); - Main.getContext().getDataManager().getAccountModel(); + AccountTreeTableModel accountModel = Main.getContext().getDataManager().getAccountModel(); + b.loadDefaultAccount(accountModel.getData()); + // Chargement des status b.getProgressBar().setString("50% : "+_("lima.progressBar.load.etape3")); b.getProgressBar().setValue(50); Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-10-14 12:55:29 UTC (rev 2716) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-10-14 14:02:42 UTC (rev 2717) @@ -19,8 +19,14 @@ package org.chorem.lima.ui; +import java.net.URL; +import javax.swing.JOptionPane; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.Main; +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.imports.XMLImport; /** * Barre de progression @@ -51,6 +57,27 @@ } + public void loadDefaultAccount(AccountDTO accountRoot) { + if (accountRoot.getChildren().isEmpty()) { + String[] response = {_("lima.response.yes"), _("lima.response.no")}; + int n = JOptionPane.showOptionDialog(this, + _("lima.question.load.accounts"), + _("lima.question"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, //do not use a custom Icon + response, //the titles of buttons + response[1]); //default button title + if (n == JOptionPane.YES_OPTION) { + XMLImport imports = new XMLImport(); + URL urlFile = ProgressBarImpl.class.getResource("/import/default_pcg.xml"); + imports.importAccount(urlFile.getFile()); + } else { + Main.getContext().getDataManager().resetAccountModel(); + } + } + } + } Modified: trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties 2009-10-14 12:55:29 UTC (rev 2716) +++ trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties 2009-10-14 14:02:42 UTC (rev 2717) @@ -42,6 +42,7 @@ lima.closure.period.begin=Period lima.closure.period.end= lima.closure.timespan.warning=Warning\: when the period is blocked, it is possible to add, edit and delete entries on the accounting period. +lima.config.locale.description= lima.config.main.configFileName.description=Absolute path to configuration file lima.config.main.copyright.description= lima.config.main.debugMode.description=Flag to have or not debug mode @@ -63,6 +64,7 @@ lima.config.remote.proxyLogin.description=Login of user on proxy server lima.config.remote.proxyPassword.description=Password of user on proxy server lima.config.remote.useProxy.description=Flag to indicate if a proxy is used to acces remote server +lima.config.ui.fullscreen= lima.configuration=Configuration lima.credit=Credit lima.daily=Daily @@ -90,13 +92,21 @@ lima.error.account.not.master=This account has not an account master lima.error.account.with.entries=This account has some entries lima.error.at.least.one.criteria=A criteria must +lima.error.entry.not.exist= +lima.error.entry.not.remove= lima.error.journal.double=A journal exist with this name lima.error.journal.not.exist=This journal doesn't exist lima.error.journal.with.transactions=This journal has some transactions lima.error.login.failed=Login failed +lima.error.period.all.timespan= +lima.error.period.create.timespan= lima.error.period.next.blocked=It exists periods blocked +lima.error.period.next.not.blocked= +lima.error.period.not.exist= lima.error.period.not.selected=Please choose a period lima.error.period.prec.not.blocked=It exists periods not blocked +lima.error.period.timespan.block= +lima.error.period.timespan.not.blocked= lima.error.service.failed=Service failed lima.error.transaction.balance=The transaction is not balanced lima.error.transaction.exist.not.balanced=It exists transactions not balanced @@ -132,6 +142,9 @@ lima.import.journal=Import journal lima.import.success=Your datas had been loaded lima.information=Information +lima.init.closed= +lima.init.context.done= +lima.init.ui.done= lima.journal=Journal lima.language=Language lima.lettered=Lettered @@ -146,6 +159,7 @@ lima.menubar.closure.listperiod=See all periods lima.menubar.closure.period=close a period (annual) lima.menubar.closure.timespan=close a period (monthly) +lima.message.config.loaded= lima.message.error.empty.line=Please choose an account lima.model.account=Account lima.model.balance=Balance @@ -199,6 +213,7 @@ lima.progressBar.load.title=Loading datas lima.question=Question lima.question.close=Do you want to close Lima ? +lima.question.load.accounts=There is no existing accounts in Lima. Do you want to load default accounts ? lima.question.remove.account=Do you want to remove this account ? lima.question.remove.entry=Do you want to remove this entry ? lima.question.remove.journal=Do you want to remove this journal ? @@ -249,3 +264,8 @@ lima.view=View lima.view.flatten=Flatten view lima.voucher=Voucher +lima.warning.nimbus.landf= +lima.warning.no.ui= +observe.action.commandline.disable.main.ui= +observe.action.commandline.help= +observe.config.configFileName.description= Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-10-14 12:55:29 UTC (rev 2716) +++ trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-10-14 14:02:42 UTC (rev 2717) @@ -43,6 +43,7 @@ lima.closure.period.begin=P\u00E9riode du lima.closure.period.end= lima.closure.timespan.warning=Attention \: lorsque la p\u00E9riode est bloqu\u00E9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u00E9es comptables sur cette p\u00E9riode. +lima.config.locale.description= lima.config.main.configFileName.description=Nom du fichier de configuration lima.config.main.copyright.description= lima.config.main.debugMode.description=flag pour activer le mode debug @@ -64,6 +65,7 @@ lima.config.remote.proxyLogin.description=Login du proxy lima.config.remote.proxyPassword.description=Mot de passe du proxy lima.config.remote.useProxy.description=Pour indiquer l'utilisation ou non d'un proxy pour atteindre le serveur distant +lima.config.ui.fullscreen= lima.configuration=Configuration lima.credit=Credit lima.daily=Quotidien @@ -90,14 +92,20 @@ lima.error.account.not.exist=Ce num\u00E9ro de compte n'existe pas lima.error.account.not.master=Ce compte ne poss\u00E8de pas de compte principal lima.error.account.with.entries=Ce compte poss\u00E8de des entr\u00E9es comptables -lima.error.at.least.one.criteria=Au moins un crit\u008Fre doit +lima.error.at.least.one.criteria=Au moins un crit\u00E8re doit lima.error.journal.double=Un journal poss\u00E8de d\u00E9j\u00E0 ce nom lima.error.journal.not.exist=Ce journal n'existe pas lima.error.journal.with.transactions=Ce journal poss\u00E8de des transactions comptables lima.error.login.failed=Echec d'authentification +lima.error.period.all.timespan= +lima.error.period.create.timespan= lima.error.period.next.blocked=Il existe des p\u00E9riodes suivantes bloqu\u00E9es +lima.error.period.next.not.blocked= +lima.error.period.not.exist= lima.error.period.not.selected=La p\u00E9riode doit \u00EAtre selectionn\u00E9e lima.error.period.prec.not.blocked=Il existe des p\u00E9riodes pr\u00E9c\u00E9dentes non bloqu\u00E9es +lima.error.period.timespan.block= +lima.error.period.timespan.not.blocked= lima.error.service.failed=Service failed lima.error.transaction.balance=La transaction n'est pas \u00E9quilibr\u00E9e lima.error.transaction.exist.not.balanced=Il existe des transactions non \u00E9quilibr\u00E9es @@ -133,6 +141,9 @@ lima.import.journal=Importer le journal lima.import.success=Vos donn\u00E9es ont bien \u00E9t\u00E9 charg\u00E9es lima.information=Information +lima.init.closed= +lima.init.context.done= +lima.init.ui.done= lima.journal=Journal lima.language=Langue lima.lettered=Lettr\u00E9 @@ -147,6 +158,7 @@ lima.menubar.closure.listperiod=Voir toutes les cl\u00F4tures lima.menubar.closure.period=Cl\u00F4turer l'exercice lima.menubar.closure.timespan=Cl\u00F4turer une p\u00E9riode +lima.message.config.loaded= lima.message.error.empty.line=Veuillez choisir un compte lima.model.account=Compte lima.model.balance=Balance @@ -200,6 +212,7 @@ lima.progressBar.load.title=Chargement des donn\u00E9es lima.question=Question lima.question.close=Voulez vous quitter Lima? +lima.question.load.accounts=Il n'y a aucun plan comptable existant dans Lima. Voulez-vous en charger un par d\u00E9faut ? lima.question.remove.account=Voulez-vous supprimer ce compte? lima.question.remove.entry=Voulez-vous supprimer cette ligne de transaction? lima.question.remove.journal=Voulez-vous supprimer ce journal? @@ -250,3 +263,8 @@ lima.view=Vue lima.view.flatten=Vue aplatie lima.voucher=Document +lima.warning.nimbus.landf= +lima.warning.no.ui= +observe.action.commandline.disable.main.ui= +observe.action.commandline.help= +observe.config.configFileName.description= Added: trunk/lima-main/src/main/resources/import/default_pcg.xml =================================================================== --- trunk/lima-main/src/main/resources/import/default_pcg.xml (rev 0) +++ trunk/lima-main/src/main/resources/import/default_pcg.xml 2009-10-14 14:02:42 UTC (rev 2717) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Callao> + <informations date="Fri Aug 07 11:35:27 CEST 2009" user="Name user" company="Name company" /> + <save> + <accounts> + <account id="org.chorem.callao.entity.Account#1249555347959#0.9019304796412684" label="COMPTES D'IMMOBILISATIONS" type="actif" accountNumber="2" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555348338#0.04260276658110562" label="Frais d'établissement" type="Actif" accountNumber="201" masterAccount="2" /> + <account id="org.chorem.callao.entity.Account#1249555348347#0.18726180615226806" label="Droit au bail" type="Actif" accountNumber="206" masterAccount="2" /> + <account id="org.chorem.callao.entity.Account#1249555497020#0.6505535213374983" label="Immobilisations corporelles" type="Actif" accountNumber="21" masterAccount="2" /> + <account id="org.chorem.callao.entity.Account#1249555618637#0.47602527280737383" label="Autres immobilisations corporelles" type="Actif" accountNumber="218" masterAccount="21" /> + <account id="org.chorem.callao.entity.Account#1249555347984#0.4908833205081513" label="COMPTES DE STOCKS ET EN-COURS" type="actif" accountNumber="3" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555347993#0.01567348299581306" label="COMPTES DE TIERS" type="actif" accountNumber="4" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555822435#0.06041671027235429" label="Fournisseurs" type="Passif" accountNumber="401" masterAccount="4" /> + <account id="org.chorem.callao.entity.Account#1249555583700#0.6265947943023162" label="Clients" type="Actif" accountNumber="411" masterAccount="4" /> + <account id="org.chorem.callao.entity.Account#1249555348000#0.6004750737819512" label="COMPTES FINANCIERS" type="actif" accountNumber="5" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555511423#0.011319837765867757" label="Caisse" type="Actif" accountNumber="53" masterAccount="5" /> + <account id="org.chorem.callao.entity.Account#1249555348022#0.930622399756405" label="COMPTES DE CHARGES" type="actif" accountNumber="6" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555348378#0.8374727763221947" label="ACHATS" type="Charge" accountNumber="60" masterAccount="6" /> + <account id="org.chorem.callao.entity.Account#1249555548999#0.018490025064101023" label="Achas de marchandises" type="Charge" accountNumber="607" masterAccount="60" /> + <account id="org.chorem.callao.entity.Account#1249555636400#0.5473094310405552" label="Impôts, taxes et versements assimilés" type="Charge" accountNumber="63" masterAccount="6" /> + <account id="org.chorem.callao.entity.Account#1249555657935#0.35366073929481334" label="Charges de personnel" type="Charge" accountNumber="64" masterAccount="6" /> + <account id="org.chorem.callao.entity.Account#1249555348027#0.6782322672056709" label="COMPTES DE PRODUITS" type="actif" accountNumber="7" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555599917#0.5953808167367928" label="Ventes de marchandises" type="Produit" accountNumber="707" masterAccount="7" /> + <account id="org.chorem.callao.entity.Account#1249555348076#0.6190508684748437" label="COMPTES SPECIAUX" type="actif" accountNumber="8" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555347952#0.9924023380704713" label="COMPTES DE CAPITAUX" type="Passif" accountNumber="1" masterAccount="0" /> + <account id="org.chorem.callao.entity.Account#1249555348157#0.3681372547493901" label="Ecarts de réévaluation" type="Passif" accountNumber="105" masterAccount="1" /> + <account id="org.chorem.callao.entity.Account#1249555348211#0.8970560365362152" label="Ecarts de réévaluation" type="actif" accountNumber="10500000" masterAccount="105" /> + <account id="org.chorem.callao.entity.Account#1249555348169#0.21975217717147555" label="Réserves" type="Passif" accountNumber="106" masterAccount="1" /> + <account id="org.chorem.callao.entity.Account#1249555348221#0.20073728197870266" label="Réserve légale" type="actif" accountNumber="1061" masterAccount="106" /> + <account id="org.chorem.callao.entity.Account#1249555348269#0.3388466646762297" label="Réserve légale" type="actif" accountNumber="10610000" masterAccount="1061" /> + <account id="org.chorem.callao.entity.Account#1249555348301#0.09087057997481063" label="réserve légale" type="actif" accountNumber="10611000" masterAccount="1061" /> + <account id="org.chorem.callao.entity.Account#1249555348230#0.6918799658776698" label="Réserves indisponibles" type="actif" accountNumber="1062" masterAccount="106" /> + <account id="org.chorem.callao.entity.Account#1249555348308#0.6217734109884933" label="Réserves indisponibles" type="actif" accountNumber="10620000" masterAccount="1062" /> + <account id="org.chorem.callao.entity.Account#1249555348244#0.009767392197928992" label="Réserves statutaires ou contractuelles" type="actif" accountNumber="1063" masterAccount="106" /> + <account id="org.chorem.callao.entity.Account#1249555348315#0.8177617600611057" label="Réserves statutaires ou contractuelles" type="actif" accountNumber="10630000" masterAccount="1063" /> + <account id="org.chorem.callao.entity.Account#1249555348253#0.7582011362212686" label="Réserves réglementes" type="actif" accountNumber="1064" masterAccount="106" /> + <account id="org.chorem.callao.entity.Account#1249555348329#0.8489995807518893" label="Réserves réglementes" type="acif" accountNumber="10640000" masterAccount="1064" /> + <account id="org.chorem.callao.entity.Account#1249555348262#0.4019019740691401" label="Autres réserves" type="actif" accountNumber="1068" masterAccount="106" /> + <account id="org.chorem.callao.entity.Account#1249555348140#0.7846696113518526" label="Capital" type="Passif" accountNumber="101" masterAccount="1" /> + <account id="org.chorem.callao.entity.Account#1249555348184#0.7230203499285881" label="Capital" type="actif" accountNumber="10100000" masterAccount="101" /> + <account id="org.chorem.callao.entity.Account#1249555348200#0.3427497656667253" label="Capital non amorti" type="actif" accountNumber="10131000" masterAccount="101" /> + </accounts> + </save> +</Callao> +

1 0

r2716 - in trunk/lima-main/src/main/java/org/chorem/lima: tree/model ui
by fdesbois＠users.chorem.org Oct. 14, 2009

Oct. 14, 2009

Author: fdesbois Date: 2009-10-14 14:55:29 +0200 (Wed, 14 Oct 2009) New Revision: 2716 Modified: trunk/lima-main/src/main/java/org/chorem/lima/tree/model/AccountTreeTableModel.java trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountViewImpl.java Log: Resolve #58 : addAccount when database is empty Modified: trunk/lima-main/src/main/java/org/chorem/lima/tree/model/AccountTreeTableModel.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/tree/model/AccountTreeTableModel.java 2009-10-14 12:54:34 UTC (rev 2715) +++ trunk/lima-main/src/main/java/org/chorem/lima/tree/model/AccountTreeTableModel.java 2009-10-14 12:55:29 UTC (rev 2716) @@ -206,7 +206,7 @@ // Calling account service String response = accountServ.addAccount(account); if (ServiceHelper.RESPOND_SUCCESS.equals(response)) { - account.getParent().addChild(account); + account.getParent().addChild(account); changeSupport.firePropertyChange(ADD_PROPERTY, null, account); } return response; Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountViewImpl.java 2009-10-14 12:54:34 UTC (rev 2715) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountViewImpl.java 2009-10-14 12:55:29 UTC (rev 2716) @@ -149,7 +149,7 @@ String description = form.getDescriptionTextField().getText(); String type = (String) form.getTypeComboBox().getSelectedItem(); if (log.isDebugEnabled()) { - log.debug("type : " + type); + log.debug("type : " + type); // Contrainte sur le type ?? } form.dispose(); AccountDTO account; @@ -160,6 +160,8 @@ /** * Class account can't be created */ + parent = model.getData(); // Root + treePath = new TreePath(parent); } else { /** * Add account child @@ -167,11 +169,11 @@ int selectedRow = table.getSelectedRow(); treePath = table.getPathForRow(selectedRow); parent = (AccountDTO) treePath.getLastPathComponent(); - account = new AccountDTO("0", number, description, type, new LinkedList<AccountDTO>(), parent); - String result = model.addAccount(treePath, account); - /** Affichage des erreurs */ - ErrorMessage.showMessage(result); } + account = new AccountDTO("0", number, description, type, new LinkedList<AccountDTO>(), parent); + String result = model.addAccount(treePath, account); + /** Affichage des erreurs */ + ErrorMessage.showMessage(result); } /**

1 0

r2715 - in trunk: . doc lima-main
by fdesbois＠users.chorem.org Oct. 14, 2009

Oct. 14, 2009

Author: fdesbois Date: 2009-10-14 14:54:34 +0200 (Wed, 14 Oct 2009) New Revision: 2715 Modified: trunk/doc/ trunk/doc/Doc technique.odt trunk/lima-main/pom.xml trunk/pom.xml Log: - Cleaning non used dependency for topia-soa - Remove jnlp and jlfgr Property changes on: trunk/doc ___________________________________________________________________ Added: svn:ignore + .~lock.Doc technique.odt# .~lock.exemples.odt# Modified: trunk/doc/Doc technique.odt =================================================================== (Binary files differ) Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-10-14 12:54:32 UTC (rev 2714) +++ trunk/lima-main/pom.xml 2009-10-14 12:54:34 UTC (rev 2715) @@ -79,11 +79,6 @@ </dependency> <dependency> - <groupId>com.sun</groupId> - <artifactId>jlfgr</artifactId> - </dependency> - - <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> @@ -117,7 +112,6 @@  <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> -   <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> @@ -128,8 +122,6 @@ <keystorepass>${codelutin.keystorepass}</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> <jnlpCodebase>${project.url}</jnlpCodebase> -  -  </properties> <packaging>jar</packaging> @@ -186,47 +178,19 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> -  - <goals> - <goal>parserJavaActionConfig</goal> - <goal>parserJava</goal> - <goal>bundle</goal> - </goals> + <id>java</id> <configuration> - <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <specificGoal>parserJavaActionConfig</specificGoal> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <param>org\/chorem\/lima\/ui\/actions\/**\/*Action.java</param> - </includes> - <excludes> - <param>org\/chorem\/lima\/ui\/actions\/**\/*AbstractAction.java</param> - </excludes> - </entry> - <entry> - <specificGoal>parserJava</specificGoal> <basedir>${maven.gen.dir}/java</basedir> </entry> </entries> </configuration> - </execution> -  + </execution> </executions> </plugin> @@ -236,7 +200,11 @@ <executions> <execution> <id>copy-dependencies</id> + <configuration> + <silent>true</silent> + </configuration> </execution> + </executions> </plugin> @@ -275,60 +243,6 @@ </activation> <build> <plugins> -  -  - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -346,63 +260,6 @@ </execution> </executions> </plugin> - -  - </plugins> </build> </profile> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-14 12:54:32 UTC (rev 2714) +++ trunk/pom.xml 2009-10-14 12:54:34 UTC (rev 2715) @@ -124,11 +124,11 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> - <dependency> +  <dependency> <groupId>net.sf.opencsv</groupId> @@ -280,6 +280,8 @@ </releases> </repository> + +  <repository>

1 0

r2714 - trunk/lima-main/src/main
by fdesbois＠users.chorem.org Oct. 14, 2009

Oct. 14, 2009

Author: fdesbois Date: 2009-10-14 14:54:32 +0200 (Wed, 14 Oct 2009) New Revision: 2714 Removed: trunk/lima-main/src/main/jnlp/ Log: - Cleaning non used dependency for topia-soa - Remove jnlp and jlfgr

1 0

r2713 - trunk
by tchemit＠users.chorem.org Oct. 11, 2009

Oct. 11, 2009

Author: tchemit Date: 2009-10-11 14:14:45 +0200 (Sun, 11 Oct 2009) New Revision: 2713 Modified: trunk/LICENSE.txt trunk/pom.xml Log: update mavenpom, junit, i18n and processor versions expect for JTimer which is NOT a mavenpom project (what a shame... must be changed) Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2009-10-06 18:32:45 UTC (rev 2712) +++ trunk/LICENSE.txt 2009-10-11 12:14:45 UTC (rev 2713) @@ -1,166 +1,674 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + Preamble - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. - 0. Additional Definitions. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. - 1. Exception to Section 3 of the GNU GPL. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + The precise terms and conditions for copying, distribution and +modification follow. - 2. Conveying Modified Versions. + TERMS AND CONDITIONS - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + 0. Definitions. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + "This License" refers to version 3 of the GNU General Public License. - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 3. Object Code Incorporating Material from Library Header Files. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - 4. Combined Works. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. + 1. Source Code. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - d) Do one of the following: + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) + The Corresponding Source for a work in source code form is that +same work. - 5. Combined Libraries. + 2. Basic Permissions. - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. - 6. Revised Versions of the GNU Lesser General Public License. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. + 4. Conveying Verbatim Copies. + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-06 18:32:45 UTC (rev 2712) +++ trunk/pom.xml 2009-10-11 12:14:45 UTC (rev 2713) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -55,7 +55,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuiton-utils.version}</version> -  </dependency> <dependency> @@ -149,6 +148,15 @@ <inceptionYear>2008</inceptionYear> <url>http://maven-site.chorem.org/lima</url> + + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> +  <developers> <developer> @@ -196,10 +204,11 @@   <axis.version>1.3</axis.version> - <swing.version>0.9.3</swing.version> + <swing.version>1.0</swing.version>  - <helper.licenseName>gpl_v3</helper.licenseName> + <license.licenseName>gpl_v3</license.licenseName> + </properties> @@ -219,7 +228,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.2-SNAPSHOT</version> </plugin> <plugin> @@ -254,47 +263,8 @@ <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/lima/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - - -  - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/lima</url> - </site> - </distributionManagement> - <repositories> - <repository> - <id>codelutin</id> - <name>NuitonReleaseRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository>  <repository> @@ -331,22 +301,8 @@  - <pluginRepository> - <id>codelutin</id> - <name>NuitonReleaseRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> - <pluginRepository> - <id>nuiton.release</id> <name>NuitonReleaseRepository</name> <url>http://maven.nuiton.org/release</url>

1 0

r2712 - trunk
by echatellier＠users.chorem.org Oct. 6, 2009

Oct. 6, 2009

Author: echatellier Date: 2009-10-06 20:32:45 +0200 (Tue, 06 Oct 2009) New Revision: 2712 Modified: trunk/pom.xml Log: Use release of callao Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-06 18:32:31 UTC (rev 2711) +++ trunk/pom.xml 2009-10-06 18:32:45 UTC (rev 2712) @@ -33,7 +33,7 @@ <dependency> <groupId>org.chorem.callao</groupId> <artifactId>callao-service</artifactId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.0</version> </dependency> <dependency>

1 0

r2711 - trunk/lima-main/src/main/assembly
by echatellier＠users.chorem.org Oct. 6, 2009

Oct. 6, 2009

Author: echatellier Date: 2009-10-06 20:32:31 +0200 (Tue, 06 Oct 2009) New Revision: 2711 Modified: trunk/lima-main/src/main/assembly/bin.xml Log: Make it works with callao in snapshot Modified: trunk/lima-main/src/main/assembly/bin.xml =================================================================== --- trunk/lima-main/src/main/assembly/bin.xml 2009-10-03 13:01:58 UTC (rev 2710) +++ trunk/lima-main/src/main/assembly/bin.xml 2009-10-06 18:32:31 UTC (rev 2711) @@ -1,65 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <assembly 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/assembly-1.1.1.xsd"> - - <id>bin</id> <formats> <format>zip</format> </formats> +  + <files> <file> <source>target/${project.build.finalName}.${project.packaging}</source> @@ -85,6 +33,16 @@ </files> <fileSets> <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-*.jar</exclude> + </excludes> + </fileSet> + <fileSet> <includes> <include>README*</include> <include>LICENSE*</include>

1 0

r2710 - in trunk/src/site: . rst
by jcouteau＠users.chorem.org Oct. 3, 2009

Oct. 3, 2009

Author: jcouteau Date: 2009-10-03 15:01:58 +0200 (Sat, 03 Oct 2009) New Revision: 2710 Removed: trunk/src/site/rst/news.rst Modified: trunk/src/site/rst/contact.rst trunk/src/site/site.xml Log: Remove news page Remove LE and AL from contact page change download link (link to redmine instead of maven repo) Modified: trunk/src/site/rst/contact.rst =================================================================== --- trunk/src/site/rst/contact.rst 2009-09-24 14:07:21 UTC (rev 2709) +++ trunk/src/site/rst/contact.rst 2009-10-03 13:01:58 UTC (rev 2710) @@ -40,35 +40,6 @@ - ----------------- -Libre-entreprise ----------------- - -.. image:: http://www.csquad.org/stages/stage-tech3/img/libre-entreprise.jpeg - -Un regroupement de sociétés expertes en solutions libres - -Libre-entreprise est un réseau de sociétés de services en logiciel libre. Son -développement est fondé sur celui de la communauté du libre : mutualisation des -compétences et transparence. - - -SiteLibreEntreprise_. - -.. _SiteLibreEntreprise: http://www.libre-entreprise.com/index.php/Accueil - - --------------- -Alliance Libre --------------- - -.. image:: http://www.solago.com/images/logo_AL.png - -SiteAllianceLibre_. - -.. _SiteAllianceLibre: http://www.alliance-libre.org/ - .. _USERS: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-users .. _DEVEL: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-devel .. _COMMITS: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-commits Deleted: trunk/src/site/rst/news.rst =================================================================== --- trunk/src/site/rst/news.rst 2009-09-24 14:07:21 UTC (rev 2709) +++ trunk/src/site/rst/news.rst 2009-10-03 13:01:58 UTC (rev 2710) @@ -1,14 +0,0 @@ -==== -News -==== - -Quoi de neuf sur le projet LIMA ? - - -Mise en Ligne du site -===================== - -``Par :`` Guillaume|Callao ``[le Mercredi 29 octobre 2008]`` - -Le site du projet est enfin en ligne, il s'étoffera au fur et à mesure de -l'avancée de Lima. Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-24 14:07:21 UTC (rev 2709) +++ trunk/src/site/site.xml 2009-10-03 13:01:58 UTC (rev 2710) @@ -15,10 +15,9 @@ <body> <menu name="Lima" inherit="top"> <item name="Présentation" href="presentation.html"/> - <item name="News" href="news.html" /> <item name="ScreenShots" href="screenshots.html"/> <item name="Features" href="features.html"/> - <item name="Téléchargements" href="http://maven.chorem.org/release/org/chorem/lima" /> + <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> <item name="Lexique comptable" href="lexique.html" /> <item name="Contacts" href="contact.html" /> <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> @@ -26,10 +25,6 @@ <menu name="Utilisateur" inherit="top" > <item name="How To" href="howto.html" /> </menu> - <menu name="Downloads" inherit="top" > - <item name="Stable" href="http://maven.chorem.org/release/org/chorem/lima/"/> - <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/lima/"/> - </menu> <menu ref="reports"/> </body>

1 0