This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 51bd8e357a509cc13a73eca416786a0b236e6fcc Merge: 31a4361 f76caff Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 3 12:04:14 2014 +0100 Merge branch 'feature/single-page-ui' into develop {coselmar-services => coselmar-bundle}/LICENSE.txt | 0 {coselmar-services => coselmar-bundle}/README.txt | 0 coselmar-bundle/pom.xml | 64 +++++++ coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 10 ++ .../persistence/CoselmarPersistenceContext.java | 12 ++ .../i18n/coselmar-persistence_en_GB.properties | 0 {coselmar-services => coselmar-rest}/LICENSE.txt | 0 {coselmar-services => coselmar-rest}/README.txt | 0 {coselmar-services => coselmar-rest}/pom.xml | 75 ++++++-- .../fr/ifremer/coselmar/beans/DocumentBean.java | 64 +++++++ .../ifremer/coselmar/converter/DateConverter.java | 32 ++++ .../coselmar/converter/JsonArrayConverter.java | 56 ++++++ .../ifremer/coselmar/converter/JsonConverter.java | 66 +++++++ .../fr/ifremer/coselmar/converter/JsonHelper.java | 89 +++++++++ .../services/CoselmarApplicationContext.java | 25 +++ .../ifremer/coselmar/services/CoselmarRender.java | 52 ++++++ .../services/CoselmarRestApplicationListener.java | 67 +++++++ .../services/CoselmarRestRequestContext.java | 34 ++++ .../coselmar/services/CoselmarRestUtil.java | 33 ++++ .../ifremer/coselmar/services/CoselmarService.java | 9 + .../CoselmarServicesApplicationContext.java | 200 +++++++++++++++++++++ .../coselmar/services/CoselmarServicesContext.java | 36 ++++ .../services/CoselmarTechnicalException.java | 24 +++ .../services/CoselmarWebServiceSupport.java | 73 ++++++++ .../services/DefaultCoselmarServicesContext.java | 102 +++++++++++ .../services/config/CoselmarServicesConfig.java | 90 ++++++++++ .../config/CoselmarServicesConfigOption.java | 90 ++++++++++ .../services/filter/CoselmarRestRequestFilter.java | 110 ++++++++++++ .../filter/CoselmarTopiaTransactionFilter.java | 48 +++++ .../CoselmarRestRequestContextInjector.java | 29 +++ .../injector/CoselmarServicesInjector.java | 32 ++++ .../coselmar/services/v1/DocumentsWebService.java | 47 +++++ .../ifremer/coselmar/services/v1/ErrorAction.java | 23 +++ .../main/resources/coselmar-services.properties | 8 + coselmar-rest/src/main/resources/log4j.properties | 9 + coselmar-rest/src/main/resources/mapping | 34 ++++ coselmar-rest/src/main/webapp/WEB-INF/web.xml | 23 +++ {coselmar-services => coselmar-ui}/LICENSE.txt | 0 {coselmar-services => coselmar-ui}/README.txt | 0 coselmar-ui/pom.xml | 74 ++++++++ coselmar-ui/src/main/webapp/WEB-INF/web.xml | 10 ++ coselmar-ui/src/main/webapp/index.html | 70 ++++++++ .../src/main/webapp/js/coselmar-controllers.js | 37 ++++ .../src/main/webapp/js/coselmar-services.js | 43 +++++ coselmar-ui/src/main/webapp/js/coselmar.js | 20 +++ coselmar-ui/src/main/webapp/views/document.html | 3 + coselmar-ui/src/main/webapp/views/documents.html | 23 +++ coselmar-ui/src/main/webapp/views/home.html | 1 + coselmar-ui/src/main/webapp/views/newdocument.html | 50 ++++++ pom.xml | 52 ++++-- 50 files changed, 2015 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.