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 4b8d807504d7cf6ee0b993d9608bde2925124e97 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 17 11:37:00 2014 +0000 fix for release 0.1 --- coselmar-bundle/pom.xml | 25 ++++++++++ coselmar-bundle/src/license/THIRD-PARTY.properties | 28 +++++++++++ coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 24 ++++++++++ coselmar-persistence/pom.xml | 54 +++++++++------------- .../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 | 32 +++++++++---- 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 | 25 +++++++++- 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 | 22 +++++++++ 49 files changed, 1188 insertions(+), 41 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index ac498ef..e97f5df 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + <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> @@ -22,18 +44,21 @@ <groupId>${project.groupId}</groupId> <artifactId>coselmar-persistence</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>coselmar-rest</artifactId> <version>${project.version}</version> <type>war</type> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>coselmar-ui</artifactId> <version>${project.version}</version> <type>war</type> + <scope>runtime</scope> </dependency> diff --git a/coselmar-bundle/src/license/THIRD-PARTY.properties b/coselmar-bundle/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..752502f --- /dev/null +++ b/coselmar-bundle/src/license/THIRD-PARTY.properties @@ -0,0 +1,28 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - General Public License (GPL) +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 17 11:30:46 UTC 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License diff --git a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml index af6387d..1ef6982 100644 --- a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Coselmar :: Bundle + $Id:$ + $HeadURL:$ + %% + 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% + --> + <web-app version="3.0" id="pollen-ui-angular" xmlns="http://java.sun.com/xml/ns/javaee" diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 270c1bd..c6226e7 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + <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> @@ -21,22 +43,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <!-- Nuiton --> @@ -44,22 +50,6 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> <dependency> <groupId>org.hibernate</groupId> diff --git a/coselmar-persistence/src/license/THIRD-PARTY.properties b/coselmar-persistence/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..26a30ef --- /dev/null +++ b/coselmar-persistence/src/license/THIRD-PARTY.properties @@ -0,0 +1,29 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 17 11:16:35 UTC 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/CoselmarPersistenceContext.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/CoselmarPersistenceContext.java index 77f8e61..7a19693 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/CoselmarPersistenceContext.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/CoselmarPersistenceContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.persistence; +/* + * #%L + * Coselmar :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java index 535a9ca..efee2f6 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.persistence.entity; +/* + * #%L + * Coselmar :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.List; public class DocumentTopiaDao extends AbstractDocumentTopiaDao<Document> { diff --git a/coselmar-persistence/src/main/xmi/coselmar-model.properties b/coselmar-persistence/src/main/xmi/coselmar-model.properties index 15b50a2..a91b2b0 100644 --- a/coselmar-persistence/src/main/xmi/coselmar-model.properties +++ b/coselmar-persistence/src/main/xmi/coselmar-model.properties @@ -1,3 +1,26 @@ +### +# #%L +# Coselmar :: Persistence +# $Id:$ +# $HeadURL:$ +# %% +# 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% +### model.tagvalue.version=1.0 package.fr.ifremer.coselmar.persistence.entity.stereotype=entity diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 7946c4c..721283b 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + <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> @@ -65,12 +87,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> </dependency> <!-- Nuiton --> @@ -87,8 +103,8 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> </dependency> <dependency> <groupId>org.nuiton.web</groupId> diff --git a/coselmar-rest/src/license/THIRD-PARTY.properties b/coselmar-rest/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..ee2d3a2 --- /dev/null +++ b/coselmar-rest/src/license/THIRD-PARTY.properties @@ -0,0 +1,41 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache 2 +# - Apache License +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software License - Version 2.0 +# - BSD License +# - BSD licence +# - BSD style +# - Bouncy Castle Licence +# - CDDL + GPLv2 with classpath exception +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - General Public License (GPL) +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - WTFPL +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 17 11:20:03 UTC 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +org.antlr--antlr-runtime--3.3=BSD License diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java index b6b067a..85445e4 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.Serializable; import java.util.Collection; import java.util.Date; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index 26c884a..a7cd935 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.converter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Date; import fr.ifremer.coselmar.beans.DocumentBean; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java index 9492c24..df2e26b 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.converter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Date; import org.apache.commons.beanutils.converters.AbstractConverter; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonArrayConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonArrayConverter.java index fa649cc..fc2fd73 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonArrayConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonArrayConverter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.converter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import org.apache.commons.beanutils.converters.AbstractConverter; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonConverter.java index 64a0c3f..3a7a0fa 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonConverter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.converter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import fr.ifremer.coselmar.persistence.CoselmarEntityEnum; import org.apache.commons.beanutils.converters.AbstractConverter; import org.nuiton.topia.persistence.TopiaEntity; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java index f9b840a..7e21213 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.converter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.lang.reflect.Type; import java.util.Date; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java index c12133d..6b59193 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.Closeable; import java.util.Locale; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java index 1ff674c..8f25af2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.IOException; import java.io.PrintWriter; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java index c8904df..830d82f 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Date; import java.util.Set; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestRequestContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestRequestContext.java index 19950f0..b00fd11 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestRequestContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestRequestContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import org.debux.webmotion.server.call.HttpContext; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java index 620408f..ad14986 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java index 09da3da..f089053 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + /** * Created by martel on 30/10/14. */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java index eb1aaa3..ab7e88d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.File; import java.util.Locale; import java.util.Map; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java index 8ab1e39..2c4e793 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Date; import java.util.Locale; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java index 3e20dbb..f74b647 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java index 5732aba..9c9d514 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Date; import java.util.Locale; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java index db78d34..bfa7c08 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Date; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java index 18c87df..fe2fae6 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.config; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.File; import java.util.List; import java.util.Map; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java index 184e918..d616a55 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.config; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.File; import org.nuiton.config.ConfigOptionDef; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java index 5b7b0ad..9836abd 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.filter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.util.Locale; import javax.servlet.http.HttpServletResponse; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java index 56969e9..c303c28 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.filter; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java index bef4a84..811c62d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.injector; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.lang.reflect.Type; import fr.ifremer.coselmar.services.CoselmarRestRequestContext; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java index 7e48c8f..278814f 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.injector; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.lang.reflect.Type; import fr.ifremer.coselmar.services.CoselmarRestRequestContext; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index 89d585c..55eabec 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.v1; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java index fc342e3..50e8a1e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.v1; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ + import javax.servlet.http.HttpServletResponse; import fr.ifremer.coselmar.services.CoselmarRestUtil; diff --git a/coselmar-rest/src/main/resources/coselmar-services.properties b/coselmar-rest/src/main/resources/coselmar-services.properties index f837c73..17a19aa 100644 --- a/coselmar-rest/src/main/resources/coselmar-services.properties +++ b/coselmar-rest/src/main/resources/coselmar-services.properties @@ -1,3 +1,26 @@ +### +# #%L +# Coselmar :: Rest Services +# $Id:$ +# $HeadURL:$ +# %% +# 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% +### hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.url=jdbc:h2:file:${coselmar.data.directory}/db/coselmar diff --git a/coselmar-rest/src/main/resources/log4j.properties b/coselmar-rest/src/main/resources/log4j.properties index 0302156..90d28a8 100644 --- a/coselmar-rest/src/main/resources/log4j.properties +++ b/coselmar-rest/src/main/resources/log4j.properties @@ -1,3 +1,26 @@ +### +# #%L +# Coselmar :: Rest Services +# $Id:$ +# $HeadURL:$ +# %% +# 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% +### log4j.rootCategory=INFO, console diff --git a/coselmar-rest/src/main/webapp/WEB-INF/web.xml b/coselmar-rest/src/main/webapp/WEB-INF/web.xml index c6b9278..ecb7efc 100644 --- a/coselmar-rest/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-rest/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Coselmar :: Rest Services + $Id:$ + $HeadURL:$ + %% + 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% + --> + <web-app version="3.0" id="coselmar" xmlns="http://java.sun.com/xml/ns/javaee" diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 8d2b419..c52685b 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + <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> @@ -16,6 +38,7 @@ <description>Coselmar UI module</description> <dependencies> +<!-- <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-wro</artifactId> @@ -45,7 +68,7 @@ <artifactId>nuiton-js-jquery</artifactId> <version>2.1.1-1</version> </dependency> - +--> </dependencies> <build> diff --git a/coselmar-ui/src/main/webapp/WEB-INF/web.xml b/coselmar-ui/src/main/webapp/WEB-INF/web.xml index 5ac3d07..341cdeb 100644 --- a/coselmar-ui/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-ui/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> + <web-app version="3.0" id="pollen-ui-angular" xmlns="http://java.sun.com/xml/ns/javaee" diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 8f7410c..e0c9e5c 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> <html ng-app="coselmarApp"> <head> diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index d3a85d2..02a3206 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ var coselmarControllers = angular.module('coselmarControllers', []); // Controller when the main page/view loads diff --git a/coselmar-ui/src/main/webapp/js/coselmar-services.js b/coselmar-ui/src/main/webapp/js/coselmar-services.js index 100c478..e4c462b 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-services.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ var coselmarServices = angular.module('coselmarServices', ['ngResource']); coselmarServices.factory('documentService', ['$resource', function($resource){ diff --git a/coselmar-ui/src/main/webapp/js/coselmar.js b/coselmar-ui/src/main/webapp/js/coselmar.js index 10ed5fc..70d0ad2 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar.js +++ b/coselmar-ui/src/main/webapp/js/coselmar.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * 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% + */ var coselmarApp = angular.module("coselmarApp", ['ngRoute', 'ngResource', 'coselmarControllers', 'coselmarServices']); coselmarApp.config(['$routeProvider', function($routeProvider) { diff --git a/coselmar-ui/src/main/webapp/views/document.html b/coselmar-ui/src/main/webapp/views/document.html index 29f497d..44b7690 100644 --- a/coselmar-ui/src/main/webapp/views/document.html +++ b/coselmar-ui/src/main/webapp/views/document.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h1> diff --git a/coselmar-ui/src/main/webapp/views/documents.html b/coselmar-ui/src/main/webapp/views/documents.html index b27a2b5..9eed5c5 100644 --- a/coselmar-ui/src/main/webapp/views/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h1> diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index d9fae9b..2447252 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> <div> <h1><small>Bienvenue sur l'</small>Application de suivi Coselmar</h1> diff --git a/coselmar-ui/src/main/webapp/views/newdocument.html b/coselmar-ui/src/main/webapp/views/newdocument.html index 7a88e5c..7465bdb 100644 --- a/coselmar-ui/src/main/webapp/views/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/newdocument.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + 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% + --> <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h2>New Document</h2> diff --git a/pom.xml b/pom.xml index 2aaf441..ae97329 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,26 @@ <?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% + --> + <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>.

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 f49c339321054041675c81d9c171fb112764247c Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 17 13:22:27 2014 +0000 fix distributionManagement --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index aee3510..0a9df13 100644 --- a/pom.xml +++ b/pom.xml @@ -81,14 +81,6 @@ <developerConnection>scm:git:https://git.codelutin.com/coselmar.git</developerConnection> </scm> <distributionManagement> - <repository> - <id>coselmar-nexus-repository</id> - <url>http://nexus.nuiton.org/nexus/content/repositories/coselmar-private-release</url> - </repository> - <snapshotRepository> - <id>coselmar-nexus-repository</id> - <url>http://nexus.nuiton.org/nexus/content/repositories/coselmar-private-snapshot</url> - </snapshotRepository> <site> <id>${site.server}</id> <url>${site.url}</url> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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>.