Author: chatellier Date: 2011-06-05 14:34:08 +0000 (Sun, 05 Jun 2011) New Revision: 3348 Log: Fix dependencies, licences, header. Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/pom.xml 2011-06-05 14:34:08 UTC (rev 3348) @@ -25,6 +25,21 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <!-- Unused, but make mavenpom happy --> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>2.2.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> @@ -45,12 +60,12 @@ <scope>compile</scope> </dependency> - <!-- <dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>3.6.4.Final</version> <scope>compile</scope> - </dependency> --> + </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> @@ -187,15 +202,14 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - <scope>compile</scope> - </dependency> - <!-- encore utilise pour les pre-scripts --> <dependency> <groupId>org.beanshell</groupId> @@ -211,7 +225,7 @@ <scope>compile</scope> </dependency> - <dependency> + <!-- <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> <version>1.5.0</version> @@ -221,7 +235,7 @@ <groupId>com.fifesoft</groupId> <artifactId>languagesupport</artifactId> <version>0.7</version> - </dependency> + </dependency> --> <dependency> <groupId>com.jcraft</groupId> @@ -237,12 +251,12 @@ <scope>compile</scope> </dependency> - <dependency> + <!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.9.1</version> <scope>compile</scope> - </dependency> + </dependency> --> <!-- Utilisé lors de l'import xml v2 (entre autre) --> <dependency> @@ -250,6 +264,16 @@ <artifactId>jaxen</artifactId> <version>1.1.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>xmlParserAPIs</artifactId> + <groupId>xerces</groupId> + </exclusion> + </exclusions> </dependency> <!-- Change this dependence if you change database --> @@ -502,7 +526,7 @@ <!-- Dependencies version --> <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.3.4</eugeneVersion> - <topiaVersion>2.5.4-SNAPSHOT</topiaVersion> + <topiaVersion>2.6-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> Modified: isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-06-05 14:34:08 UTC (rev 3348) @@ -24,6 +24,7 @@ # - Java Transaction API (JTA) License # - Jaxen license # - LGPL +# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for JavaMail(TM) API @@ -32,14 +33,16 @@ # - Sun's Binary Code License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The OpenSymphony Software License, Version 1.1 # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Mar 22 15:45:15 CET 2011 +#Sun Jun 05 16:28:53 CEST 2011 antlr--antlr--2.7.6--jar=BSD License aspectwerkz--aspectwerkz--2.0--jar=GNU Lesser General Public License aspectwerkz--aspectwerkz-core--2.0--jar=GNU Lesser General Public License @@ -49,7 +52,7 @@ commons-jxpath--commons-jxpath--1.3--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 License -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL v. 2.1) javax.activation--activation--1.1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API javax.transaction--jta--1.1--jar=Java Transaction API (JTA) License @@ -68,4 +71,4 @@ qdox--qdox--1.4--jar=Apache Software License, Version 2.0 trove--trove--1.0.2--jar=Lesser General Public License (LGPL) xalan--xalan--2.6.0--jar=Apache Software License Version 2.0 -xerces--xmlParserAPIs--2.6.2--jar=Apache Software License, Version 1.1 +xerces--xercesImpl--2.6.2--jar=Apache Software License, Version 1.1 Modified: isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,3 +1,27 @@ +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 CodeLutin, Chatellier Eric +# %% +# 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 2 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-2.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2011 CodeLutin + %% + 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 2 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-2.0.html>. + #L% + --> + <experimentalDesign version="2"> <factors> <factor name="factor 1 (double continuous)" property="continuous" type="real">