This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from b7877b3 Merge branch 'feature/1207' into develop adds 1e13def refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur adds d2dd63f refs #1210 allow to configure defferent address for Ejb than Http new 0047b54 Merge branch 'feature/1210-client-server-params' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0047b54a4276bcf7015d31ba91203b32f15789d6 Merge: b7877b3 d2dd63f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 7 16:50:19 2015 +0200 Merge branch 'feature/1210-client-server-params' into develop Conflicts: lima-server/src/main/java/org/chorem/lima/server/LimaServer.java lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Summary of changes: lima-business-api/pom.xml | 13 ----- .../chorem/lima/business/LimaServiceFactory.java | 8 --- .../chorem/lima/business/api/OptionsService.java | 3 +- .../chorem/lima/business/LimaBusinessConfig.java | 57 ++++++++++++++++------ .../lima/business/ejb/OptionsServiceImpl.java | 6 +-- .../resources/i18n/lima-business_en_GB.properties | 4 ++ .../resources/i18n/lima-business_fr_FR.properties | 10 ++-- lima-server/README.txt | 26 ++++++++-- lima-server/pom.xml | 1 - .../org/chorem/lima/server/HttpServerService.java | 14 ++++-- .../java/org/chorem/lima/server/LimaServer.java | 43 ++++++++++++++-- .../org/chorem/lima/server/LimaServerConfig.java | 2 - lima-swing/README.txt | 4 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 9 ---- .../java/org/chorem/lima/ui/MainViewHandler.java | 5 +- .../resources/i18n/lima-swing_en_GB.properties | 8 +-- .../resources/i18n/lima-swing_fr_FR.properties | 2 + 17 files changed, 137 insertions(+), 78 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.