This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 09e95b1b8bfe4f51e374da4e394d40e30ebd291a Merge: 5fcf5d3 16d92db Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jul 11 18:11:30 2014 +0200 Merge branch 'feature/addPollenResourceApi' into develop pollen-persistence/src/main/xmi/pollen.properties | 1 - pollen-persistence/src/main/xmi/pollen.zargo | Bin 20233 -> 20385 bytes .../pollen/rest/api/v1/PollenResourceApi.java | 77 +++++++++++++++ pollen-rest-api/src/main/resources/mapping | 9 ++ .../pollen/services/bean/ResourceFileBean.java | 108 +++++++++++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 68 +++++++++++++ .../pollen/services/bean/ResourceStreamBean.java | 102 +++++++++++++++++++ .../pollen/services/service/ChoiceService.java | 20 +++- .../services/service/PollenResourceService.java | 106 ++++++++++++++++++++ .../services/service/PollenServiceSupport.java | 22 ++--- .../src/main/webapp/js/controllers/pollCtrl.js | 24 ++--- pollen-ui-angular/src/main/webapp/js/directives.js | 12 ++- pollen-ui-angular/src/main/webapp/js/services.js | 21 ++++ .../src/main/webapp/partials/home.html | 2 +- 14 files changed, 537 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.