[Suiviobsmer-commits] r808 - in trunk: src/license wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-business/src/test/resources wao-business/src/test/resources/import wao-ui/src/license wao-ui/src/main/assembly wao-ui/src/test/resources
Author: tchemit Date: 2010-11-26 15:59:59 +0000 (Fri, 26 Nov 2010) New Revision: 808 Log: add headers migrate third-party files Modified: trunk/src/license/project.xml trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/boat_districts.kml trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/test/resources/log4j.properties Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/src/license/project.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version='1.0' encoding='UTF-8'?> +<!-- + #%L + Wao + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,7 +1,6 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD # - BSD License # - BSD license # - BSD style @@ -22,12 +21,12 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jul 11 22:47:24 CEST 2010 -antlr--antlr--2.7.6=BSD -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +#Fri Nov 26 17:04:07 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException Modified: trunk/wao-business/src/test/resources/WaoTest.properties =================================================================== --- trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### hibernate.hbm2ddl.auto=update hibernate.show_sql=false Modified: trunk/wao-business/src/test/resources/import/boat_districts.kml =================================================================== --- trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> +<!-- + #%L + Wao :: Business + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <kml xmlns="http://www.opengis.net/kml/2.2"> <Document> <Folder> Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=warn, A1 Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -17,6 +17,7 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -30,17 +31,17 @@ # Please fill the missing licenses for dependencies : # # -#Mon Oct 11 17:34:56 CEST 2010 -antlr--antlr--2.7.6=BSD -com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.1=BSD +#Fri Nov 26 17:05:56 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-beanutils--commons-beanutils-core--1.7.0--jar=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javassist--javassist--3.9.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.1--jar=BSD Modified: trunk/wao-ui/src/main/assembly/Wao.properties =================================================================== --- trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,2 +1,25 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### hibernate.hbm2ddl.auto=update Modified: trunk/wao-ui/src/main/assembly/bin.xml =================================================================== --- trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Wao :: Web Interface + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <assembly 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/assembly-1.1.1.xsd"> <id>bin</id> Modified: trunk/wao-ui/src/test/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=WARN, console
participants (1)
-
tchemit@users.labs.libre-entreprise.org