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 f7434b4d44aeef6ad2002cbb1b57ae3b792b3b87 Merge: b2071f8 cd2ff95 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 17 13:31:28 2014 +0000 Merge master in develop coselmar-bundle/pom.xml | 28 +++++ coselmar-bundle/src/license/THIRD-PARTY.properties | 28 +++++ coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 24 +++++ coselmar-persistence/pom.xml | 57 +++++----- .../src/license/THIRD-PARTY.properties | 29 ++++++ .../persistence/CoselmarPersistenceContext.java | 24 +++++ .../persistence/entity/DocumentTopiaDao.java | 24 +++++ .../src/main/xmi/coselmar-model.properties | 23 ++++ coselmar-rest/pom.xml | 35 +++++-- coselmar-rest/src/license/THIRD-PARTY.properties | 41 ++++++++ .../fr/ifremer/coselmar/beans/DocumentBean.java | 24 +++++ .../coselmar/converter/BeanEntityConverter.java | 24 +++++ .../ifremer/coselmar/converter/DateConverter.java | 24 +++++ .../coselmar/converter/JsonArrayConverter.java | 24 +++++ .../ifremer/coselmar/converter/JsonConverter.java | 24 +++++ .../fr/ifremer/coselmar/converter/JsonHelper.java | 24 +++++ .../services/CoselmarApplicationContext.java | 24 +++++ .../ifremer/coselmar/services/CoselmarRender.java | 24 +++++ .../services/CoselmarRestApplicationListener.java | 24 +++++ .../services/CoselmarRestRequestContext.java | 24 +++++ .../coselmar/services/CoselmarRestUtil.java | 24 +++++ .../ifremer/coselmar/services/CoselmarService.java | 24 +++++ .../CoselmarServicesApplicationContext.java | 24 +++++ .../coselmar/services/CoselmarServicesContext.java | 24 +++++ .../services/CoselmarTechnicalException.java | 24 +++++ .../services/CoselmarWebServiceSupport.java | 24 +++++ .../services/DefaultCoselmarServicesContext.java | 24 +++++ .../services/config/CoselmarServicesConfig.java | 24 +++++ .../config/CoselmarServicesConfigOption.java | 24 +++++ .../services/filter/CoselmarRestRequestFilter.java | 24 +++++ .../filter/CoselmarTopiaTransactionFilter.java | 24 +++++ .../CoselmarRestRequestContextInjector.java | 24 +++++ .../injector/CoselmarServicesInjector.java | 24 +++++ .../coselmar/services/v1/DocumentsWebService.java | 24 +++++ .../ifremer/coselmar/services/v1/ErrorAction.java | 24 +++++ .../main/resources/coselmar-services.properties | 23 ++++ coselmar-rest/src/main/resources/log4j.properties | 23 ++++ coselmar-rest/src/main/webapp/WEB-INF/web.xml | 24 +++++ coselmar-ui/pom.xml | 28 ++++- coselmar-ui/src/main/webapp/WEB-INF/web.xml | 24 +++++ coselmar-ui/src/main/webapp/index.html | 23 ++++ .../src/main/webapp/js/coselmar-controllers.js | 23 ++++ .../src/main/webapp/js/coselmar-services.js | 23 ++++ coselmar-ui/src/main/webapp/js/coselmar.js | 23 ++++ coselmar-ui/src/main/webapp/views/document.html | 23 ++++ coselmar-ui/src/main/webapp/views/documents.html | 23 ++++ coselmar-ui/src/main/webapp/views/home.html | 23 ++++ coselmar-ui/src/main/webapp/views/newdocument.html | 23 ++++ pom.xml | 116 +++++---------------- 49 files changed, 1204 insertions(+), 131 deletions(-) diff --cc coselmar-bundle/pom.xml index 7f03034,7955ac8..c42e5ff --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@@ -1,4 -1,26 +1,29 @@@ <?xml version="1.0" encoding="UTF-8"?> ++<<<<<<< HEAD ++======= + <!-- + #%L + Coselmar :: Bundle + %% + Copyright (C) 2014 Ifremer, 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% + --> + ++>>>>>>> refs/heads/master <project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --cc coselmar-persistence/pom.xml index 0eaec2f,fd8a8aa..9d953fd --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@@ -1,4 -1,26 +1,29 @@@ <?xml version="1.0" encoding="UTF-8"?> ++<<<<<<< HEAD ++======= + <!-- + #%L + Coselmar :: Persistence + %% + Copyright (C) 2014 Ifremer, 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% + --> + ++>>>>>>> refs/heads/master <project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --cc coselmar-rest/pom.xml index d0d72f9,402db18..34b7fc0 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@@ -1,4 -1,26 +1,29 @@@ <?xml version="1.0" encoding="UTF-8"?> ++<<<<<<< HEAD ++======= + <!-- + #%L + Coselmar :: Rest Services + %% + Copyright (C) 2014 Ifremer, 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% + --> + ++>>>>>>> refs/heads/master <project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --cc coselmar-ui/pom.xml index 004e450,d7bda8f..3f5fa64 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@@ -1,4 -1,26 +1,29 @@@ <?xml version="1.0" encoding="UTF-8"?> ++<<<<<<< HEAD ++======= + <!-- + #%L + Coselmar :: UI + %% + Copyright (C) 2014 Ifremer, 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% + --> + ++>>>>>>> refs/heads/master <project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --cc pom.xml index 07f4aef,197ca0f..cddf632 --- a/pom.xml +++ b/pom.xml @@@ -1,5 -1,27 +1,30 @@@ <?xml version="1.0" encoding="UTF-8"?> - + <!-- + #%L + Coselmar + %% + Copyright (C) 2014 Ifremer, 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% + --> + ++<<<<<<< HEAD ++======= + ++>>>>>>> refs/heads/master <project 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/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.