- Isis-fish-commits - mailman.cloud.codelutin.com

r3511 - trunk
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 17:32:07 +0200 (Fri, 28 Oct 2011) New Revision: 3511 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3511 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.0-beta-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:24:46 UTC (rev 3510) +++ trunk/pom.xml 2011-10-28 15:32:07 UTC (rev 3511) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> @@ -12,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-1-SNAPSHOT</version> + <version>4.0.0.0-beta-1</version>  <dependencies> @@ -705,9 +704,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0-beta-1</url> </scm> <repositories>

1 0

r3510 - trunk
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 17:24:46 +0200 (Fri, 28 Oct 2011) New Revision: 3510 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3510 Log: Use nuiton matrix 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:02:40 UTC (rev 3509) +++ trunk/pom.xml 2011-10-28 15:24:46 UTC (rev 3510) @@ -63,14 +63,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <scope>compile</scope> </dependency>

1 0

r3509 - trunk
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 17:02:40 +0200 (Fri, 28 Oct 2011) New Revision: 3509 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3509 Log: Add deploiement site info Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 14:27:34 UTC (rev 3508) +++ trunk/pom.xml 2011-10-28 15:02:40 UTC (rev 3509) @@ -532,6 +532,13 @@ <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>--> </properties> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/isis-fish</url> + </site> + </distributionManagement> + <build> <pluginManagement> <plugins>

1 0

r3508 - trunk/src/site/rst/v3/user
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 16:27:34 +0200 (Fri, 28 Oct 2011) New Revision: 3508 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3508 Log: Fix jrst bug Modified: trunk/src/site/rst/v3/user/LaunchOption.rst Modified: trunk/src/site/rst/v3/user/LaunchOption.rst =================================================================== --- trunk/src/site/rst/v3/user/LaunchOption.rst 2011-10-28 13:47:33 UTC (rev 3507) +++ trunk/src/site/rst/v3/user/LaunchOption.rst 2011-10-28 14:27:34 UTC (rev 3508) @@ -45,7 +45,7 @@ Import de fichiers dans le repository local ------------------------------------------- ---import <file.zip> +--import <file.zip> TODO Le fichier doit avoir été exporté par isis-fish et donc respecter une certaine norme (arborescence).

1 0

r3507 - in trunk/src: license main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/equation main/java/fr/ifremer/isisfish/ui/widget/editor main/java/fr/ifremer/isisfish/util main/resources/templates/script main/resources/templates/ssh test/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 15:47:33 +0200 (Fri, 28 Oct 2011) New Revision: 3507 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3507 Log: Udpate header and third party Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java trunk/src/main/resources/templates/script/equation.ftl trunk/src/main/resources/templates/script/export.ftl trunk/src/main/resources/templates/script/rule.ftl trunk/src/main/resources/templates/script/script.ftl trunk/src/main/resources/templates/script/sensitivityanalysis.ftl trunk/src/main/resources/templates/script/sensitivityexport.ftl trunk/src/main/resources/templates/script/simulationplan.ftl trunk/src/main/resources/templates/script/simulator.ftl trunk/src/main/resources/templates/ssh/qsub-script.ftl trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/license/THIRD-PARTY.properties 2011-10-28 13:47:33 UTC (rev 3507) @@ -5,21 +5,24 @@ # - ASM License # - Apache Software License # - Apache Software License Version 2.0 +# - Apache Software License, Version 1.1 # - Apache Software License, Version 2.0 # - BBN Technologies # - BSD License # - BSD licence +# - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence # - GPL # - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JDom license # - Java Transaction API (JTA) License # - Jaxen license +# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -30,6 +33,7 @@ # - Sun's Binary Code License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - http://asm.ow2.org/license.html # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ @@ -38,33 +42,34 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jun 15 11:57:08 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 -aspectwerkz--aspectwerkz-jdk5--2.0--jar=GNU Lesser General Public License -com.ibm.icu--icu4j--2.6.1--jar=ICU License -com.sun--tools--1.6.0.16--jar=Sun's Binary Code License -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 -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 -jaxen--jaxen--1.1.1--jar=Jaxen license -jdom--jdom--1.0--jar=JDom license -jrexx--jrexx--1.1.1--jar=Apache Software License -net.java.dev.jna--jna--3.2.3--jar=Lesser General Public License (LGPL v. 2.1) -ognl--ognl--3.0--jar=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.3--jar=ANTLR 3 License -org.nuiton.thirdparty--JRI--0.8-4--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--REngine--0.6-1--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--Rserve--0.6-1--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--asm--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-util--1.5.4-snapshot--jar=ASM License -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--xercesImpl--2.6.2--jar=Apache Software License, Version 1.1 +#Fri Oct 28 15:35:59 CEST 2011 +antlr--antlr--2.7.6=BSD License +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License +com.ibm.icu--icu4j--2.6.1=ICU License +com.sun--tools--1.6.0.16=Sun's Binary Code License +commons-jxpath--commons-jxpath--1.3=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 License +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API +javax.transaction--jta--1.1=Java Transaction API (JTA) License +jaxen--jaxen--1.1.1=Jaxen license +jdom--jdom--1.0=JDom license +jrexx--jrexx--1.1.1=Apache Software License +net.java.dev.jna--jna--3.2.3=Lesser General Public License (LGPL v. 2.1) +org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.nuiton.thirdparty--JRI--0.8-4=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--REngine--0.6-1=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--Rserve--0.6-1=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License +qdox--qdox--1.4=Apache Software License, Version 2.0 +trove--trove--1.0.2=Lesser General Public License (LGPL) +xalan--xalan--2.6.0=Apache Software License Version 2.0 +xerces--xercesImpl--2.6.2=Apache Software License, Version 1.1 Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -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: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -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: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -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: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -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: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -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% */ @@ -97,4 +95,4 @@ //return valueId; } -} \ No newline at end of file +} Modified: trunk/src/main/resources/templates/script/equation.ftl =================================================================== --- trunk/src/main/resources/templates/script/equation.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/equation.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,2 +1,26 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> // ${name} // put your code here Modified: trunk/src/main/resources/templates/script/export.ftl =================================================================== --- trunk/src/main/resources/templates/script/export.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/export.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- trunk/src/main/resources/templates/script/rule.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/rule.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/script.ftl =================================================================== --- trunk/src/main/resources/templates/script/script.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/script.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/sensitivityanalysis.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- trunk/src/main/resources/templates/script/sensitivityexport.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/sensitivityexport.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- trunk/src/main/resources/templates/script/simulationplan.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/simulationplan.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/script/simulator.ftl =================================================================== --- trunk/src/main/resources/templates/script/simulator.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/script/simulator.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> /* * Copyright (C) ${date?date?string("yyyy")} ${author} * Modified: trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- trunk/src/main/resources/templates/ssh/qsub-script.ftl 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/main/resources/templates/ssh/qsub-script.ftl 2011-10-28 13:47:33 UTC (rev 3507) @@ -1,3 +1,27 @@ +<#-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 Ifremer, 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% +--> #!/bin/csh cd "${isishome}" Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2011-10-28 13:30:42 UTC (rev 3506) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2011-10-28 13:47:33 UTC (rev 3507) @@ -284,4 +284,33 @@ Assert.assertTrue("String " + isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\" not found in template", content.indexOf(isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\"") > 0); Assert.assertTrue("Action --simulateRemotelly not on script", content.indexOf(" --simulateRemotelly ") > 0); } + + /** + * Test that prescript starts with shebang. + * + * @throws IOException when freemarker throws it + * @throws TemplateException when freemarker throws it + */ + @Test + public void testFreemarkerTemplateScriptShebang() throws IOException, TemplateException { + + // some things to test ! + String shortSimulationId = "as_ICES2010_M+_10%_152Param_2010-11-08-17-18"; + String simulationId = shortSimulationId + "_122"; + String simulationZip = "simulation-" + simulationId + "-preparation.zip"; + String simulationResultZip = "/tmp/simulation-" + simulationId + "-result.zip"; + String simulationPreScript = null; + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, shortSimulationId, + simulationZip, true, simulationResultZip, simulationPreScript, true); + + if (log.isInfoEnabled()) { + log.info("Script content = " + content); + } + + // simulation parameters + Assert.assertTrue(content.startsWith("#!/bin/csh")); + } } \ No newline at end of file

1 0

r3506 - trunk
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 15:30:42 +0200 (Fri, 28 Oct 2011) New Revision: 3506 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3506 Log: Remove unused dependency Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 12:44:46 UTC (rev 3505) +++ trunk/pom.xml 2011-10-28 13:30:42 UTC (rev 3506) @@ -32,15 +32,7 @@ <scope>compile</scope> </dependency> -  <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>2.2.3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> @@ -516,6 +508,7 @@ <properties>  <projectId>isis-fish</projectId> + <platform>forge.codelutin.com</platform> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName>

1 0

r3505 - in trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher resources/i18n
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 14:44:46 +0200 (Fri, 28 Oct 2011) New Revision: 3505 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3505 Log: Add user message on SA process Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-10-28 12:32:46 UTC (rev 3504) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-10-28 12:44:46 UTC (rev 3505) @@ -667,6 +667,11 @@ int numberOfSimulation = params.getNumberOfSensitivitySimulation(); if (numberOfSimulation > 0) { + + // display user text "Looking for last simulation" + SimulationControl control = job.getItem().getControl(); + control.setText(_("isisfish.simulation.message.lookingforlast")); + // this is a sensitivity simulation String simulationId = job.getId(); String simulationCommonPrefix = simulationId.substring(0, @@ -679,6 +684,8 @@ // et on l'envoie au script d'analyse de sensibilite if (numberFinished == numberOfSimulation) { + control.setText(_("isisfish.simulation.message.analyzeResults")); + SensitivityAnalysis sensitivityAnalysis = params.getSensitivityAnalysis(); if (sensitivityAnalysis != null) { if (log.isDebugEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-10-28 12:32:46 UTC (rev 3504) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-10-28 12:44:46 UTC (rev 3505) @@ -1317,7 +1317,7 @@ */ protected void compileAllFile(SimulationControl control, File directory) { - control.setText("Scripts and rules Compilation"); + control.setText(_("isisfish.simulation.message.scriptscompilation")); long currentTime = System.nanoTime(); // Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-10-28 12:32:46 UTC (rev 3504) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-10-28 12:44:46 UTC (rev 3505) @@ -883,6 +883,9 @@ isisfish.simulation.menu.import=Restore simulation parameters isisfish.simulation.menu.save=Save simulation parameters isisfish.simulation.menu.simulation=Simulation +isisfish.simulation.message.analyzeResults=Results analysis +isisfish.simulation.message.lookingforlast=Looking for last simulation +isisfish.simulation.message.scriptscompilation=Rules and scripts compilation isisfish.simulation.remote.message.connection=Connecting to Caparmor isisfish.simulation.remote.message.deletingfiles=Deleting simulation files isisfish.simulation.remote.message.downloadresults=Downloading results Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-10-28 12:32:46 UTC (rev 3504) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-10-28 12:44:46 UTC (rev 3505) @@ -883,6 +883,9 @@ isisfish.simulation.menu.import=Restaurer les paramètres d'une simulation isisfish.simulation.menu.save=Sauver les paramètres de la simulation isisfish.simulation.menu.simulation=Simulation +isisfish.simulation.message.analyzeResults=Analyse des résultats +isisfish.simulation.message.lookingforlast=Recherche de la dernière simulation +isisfish.simulation.message.scriptscompilation=Compilation des scripts isisfish.simulation.remote.message.connection=Connexion à Caparmor isisfish.simulation.remote.message.deletingfiles=Suppression des fichiers de simulation isisfish.simulation.remote.message.downloadresults=Téléchargement des résultats

1 0

r3504 - trunk
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 14:32:46 +0200 (Fri, 28 Oct 2011) New Revision: 3504 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3504 Log: Update hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 12:31:01 UTC (rev 3503) +++ trunk/pom.xml 2011-10-28 12:32:46 UTC (rev 3504) @@ -524,7 +524,7 @@ <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.1</eugeneVersion> <topiaVersion>2.6.3</topiaVersion> - <hibernateVersion>3.6.7.Final</hibernateVersion> + <hibernateVersion>3.6.8.Final</hibernateVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r3503 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 14:31:01 +0200 (Fri, 28 Oct 2011) New Revision: 3503 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3503 Log: Create new scripts in community repository Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -286,31 +286,31 @@ //TODO do test on category CodeSourceStorage script = null; switch (scriptType) { - case Formule: + case CommunityFormule: script = FormuleStorage.createFormule(category, realFilename, Language.JAVA); break; - case SimulationPlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getSimulationPlan(fileName); break; - case Export: - script = ExportStorage.getExport(fileName); + case CommunityExport: + script = ExportStorage.getCommunityExport(fileName); break; - case Rule: - script = RuleStorage.getRule(fileName); + case CommunityRule: + script = RuleStorage.getCommunityRule(fileName); break; - case Script: - script = ScriptStorage.getScript(fileName); + case CommunityScript: + script = ScriptStorage.getCommunityScript(fileName); break; - case Simulator: - script = SimulatorStorage.getSimulator(fileName); + case CommunitySimulator: + script = SimulatorStorage.getCommunitySimulator(fileName); break; - case Sensitivity: - script = SensitivityAnalysisStorage.getSensitivityAnalysis(fileName); + case CommunitySensitivity: + script = SensitivityAnalysisStorage.getCommunitySensitivityAnalysis(fileName); break; - case SensitivityExport: + case CommunitySensitivityExport: script = SensitivityExportStorage - .getSensitivityExport(fileName); + .getCommunitySensitivityExport(fileName); break; default: if (log.isErrorEnabled()) { @@ -320,8 +320,7 @@ if (script.exists()) { // Message d'erreur si le fichier existe en local. - String message = _("isisfish.error.file.already.exists", - fileName); + String message = _("isisfish.error.file.already.exists", fileName); Exception e = new RuntimeException(message); returnError(_("isisfish.error.script.create", fileName, e .getMessage()), e); @@ -459,7 +458,7 @@ case CommunityRule: script = RuleStorage.getCommunityRule(file.getName()); break; - case CommunityAnalysePlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getCommunitySimulationPlan(file.getName()); break; case CommunityExport: @@ -1127,7 +1126,7 @@ CommunitySensitivityExport( SensitivityExportStorage.getCommunitySensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), - CommunityAnalysePlan( + CommunitySimulationPlan( SimulationPlanStorage.getCommunitySimulationPlanDirectory(), SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE), CommunitySimulator( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -56,7 +56,7 @@ ScriptMapping[] values = ScriptMapping.values(); mappings = new ArrayList<ScriptMapping>(values.length); for (ScriptMapping mapping : values) { - if (mapping.isOfficialVCS()) { + if (!mapping.isOfficialVCS()) { mappings.add(mapping); } }

1 0

r3502 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com Oct. 28, 2011

Oct. 28, 2011

Author: echatellier Date: 2011-10-28 14:30:42 +0200 (Fri, 28 Oct 2011) New Revision: 3502 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3502 Log: Fix UI layout Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:19:03 UTC (rev 3501) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:30:42 UTC (rev 3502) @@ -216,13 +216,13 @@ <cell fill='both' weightx='1' weighty='1'> <Table> <row> - <cell fill="horizontal" weightx='1' columns="2"> + <cell fill="horizontal" columns="2"> <Table> <row> <cell> <JLabel text="isisfish.sensitivity.equation.variablename" enabled='{isSelectedDomain()}' /> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JTextField id="variableNameField" enabled='{isSelectedDomain()}'/> </cell> </row> @@ -230,13 +230,13 @@ </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JRadioButton id="minMaxButton" text="isisfish.sensitivity.continuousminmaxtype" onActionPerformed="setPercentageTypeDomain(!minMaxButton.isSelected())" selected="{!isPercentageTypeDomain()}" enabled='{isSelectedDomain()}'/> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JRadioButton id="percentageTypeButton" text="isisfish.sensitivity.continuouspercentagetype" onActionPerformed="setPercentageTypeDomain(percentageTypeButton.isSelected())" selected="{isPercentageTypeDomain()}" @@ -244,7 +244,7 @@ </cell> </row> <row> - <cell fill="both" weightx='1' weighty='1' columns="2"> + <cell fill="both" weighty='1' columns="2"> <JPanel layout="{new CardLayout()}" id="hidablePanel"> <Table border='{BorderFactory.createTitledBorder("")}' constraints='"minMaxType"'> <row>

1 0