Author: chatellier Date: 2011-01-20 16:53:32 +0000 (Thu, 20 Jan 2011) New Revision: 3137 Log: Add 64 bit launch scripts Added: isis-fish/trunk/src/main/assembly/isisfish.bat isis-fish/trunk/src/main/assembly/isisfish.sh isis-fish/trunk/src/main/assembly/isisfish64.bat isis-fish/trunk/src/main/assembly/isisfish64.sh Removed: isis-fish/trunk/src/main/assembly/go.bat isis-fish/trunk/src/main/assembly/go.sh Modified: isis-fish/trunk/src/license/THIRD-PARTY.properties isis-fish/trunk/src/main/assembly/bin.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/trunk/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/trunk/src/license/THIRD-PARTY.properties 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/license/THIRD-PARTY.properties 2011-01-20 16:53:32 UTC (rev 3137) @@ -12,6 +12,7 @@ # - BSD licence # - 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 # - GNU LESSER GENERAL PUBLIC LICENSE @@ -35,7 +36,6 @@ # - The H2 License, Version 1.0 # - The OpenSymphony Software License 1.1 # - The OpenSymphony Software License, Version 1.1 -# - dom4j # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ @@ -43,7 +43,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Nov 30 17:30:55 CET 2010 +#Thu Jan 20 17:35:50 CET 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 @@ -52,6 +52,7 @@ 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.help--javahelp--2.0.02--jar=GNU General Public License - Version 2 Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/main/assembly/bin.xml 2011-01-20 16:53:32 UTC (rev 3137) @@ -63,8 +63,10 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>go.sh</include> - <include>go.bat</include> + <include>isisfish.sh</include> + <include>isisfish.bat</include> + <include>isisfish64.sh</include> + <include>isisfish64.bat</include> </includes> </fileSet> </fileSets> Deleted: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/main/assembly/go.bat 2011-01-20 16:53:32 UTC (rev 3137) @@ -1,5 +0,0 @@ - at echo off - -echo [Script] Isis starting... -java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 - Deleted: isis-fish/trunk/src/main/assembly/go.sh =================================================================== --- isis-fish/trunk/src/main/assembly/go.sh 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/main/assembly/go.sh 2011-01-20 16:53:32 UTC (rev 3137) @@ -1,30 +0,0 @@ -### -# #%L -# IsisFish -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 1999 - 2010 Ifremer, 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% -### -#!/bin/sh - -MEMORY="-Xmx1024M" -JRIARGS="-Djava.library.path=jri -DR.type=jni" - -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt Added: isis-fish/trunk/src/main/assembly/isisfish.bat =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish.bat (rev 0) +++ isis-fish/trunk/src/main/assembly/isisfish.bat 2011-01-20 16:53:32 UTC (rev 3137) @@ -0,0 +1,5 @@ + at echo off + +echo [Script] Isis starting... +java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 + Added: isis-fish/trunk/src/main/assembly/isisfish.sh =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish.sh (rev 0) +++ isis-fish/trunk/src/main/assembly/isisfish.sh 2011-01-20 16:53:32 UTC (rev 3137) @@ -0,0 +1,30 @@ +### +# #%L +# IsisFish +# +# $Id: go.sh 3124 2010-11-29 18:14:09Z chatellier $ +# $HeadURL$ +# %% +# Copyright (C) 1999 - 2010 Ifremer, 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% +### +#!/bin/sh + +MEMORY="-Xmx1024M" +JRIARGS="-Djava.library.path=jri -DR.type=jni" + +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt Property changes on: isis-fish/trunk/src/main/assembly/isisfish.sh ___________________________________________________________________ Added: svn:executable + * Added: isis-fish/trunk/src/main/assembly/isisfish64.bat =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish64.bat (rev 0) +++ isis-fish/trunk/src/main/assembly/isisfish64.bat 2011-01-20 16:53:32 UTC (rev 3137) @@ -0,0 +1,5 @@ + at echo off + +echo [Script] Isis starting... +java -Xmx1024M -Djava.library.path=jri64 -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 + Added: isis-fish/trunk/src/main/assembly/isisfish64.sh =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish64.sh (rev 0) +++ isis-fish/trunk/src/main/assembly/isisfish64.sh 2011-01-20 16:53:32 UTC (rev 3137) @@ -0,0 +1,30 @@ +### +# #%L +# IsisFish +# +# $Id: go.sh 3124 2010-11-29 18:14:09Z chatellier $ +# $HeadURL$ +# %% +# Copyright (C) 1999 - 2010 Ifremer, 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% +### +#!/bin/sh + +MEMORY="-Xmx1024M" +JRIARGS="-Djava.library.path=jri64 -DR.type=jni" + +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt Property changes on: isis-fish/trunk/src/main/assembly/isisfish64.sh ___________________________________________________________________ Added: svn:executable + * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-01-20 16:53:32 UTC (rev 3137) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 6); + protected final static Version version = new Version(3, 3, 0, 7); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version( Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-12-17 14:37:21 UTC (rev 3136) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-01-20 16:53:32 UTC (rev 3137) @@ -53,7 +53,7 @@ */ @Test public void testCRLFOnBat() throws IOException { - File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "go.bat"); + File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "isisfish.bat"); String content = FileUtils.readFileToString(batFile); System.out.println(content);