Author: echatellier Date: 2014-08-28 17:52:19 +0200 (Thu, 28 Aug 2014) New Revision: 4102 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4102 Log: Fix assembly and default memory Added: branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j2.xml Removed: branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j.properties Modified: branches/4.3.0-log4j2/pom.xml branches/4.3.0-log4j2/src/main/assembly/bin.xml branches/4.3.0-log4j2/src/main/assembly/isisfish.bat branches/4.3.0-log4j2/src/main/assembly/isisfish.sh Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-08-28 14:25:25 UTC (rev 4101) +++ branches/4.3.0-log4j2/pom.xml 2014-08-28 15:52:19 UTC (rev 4102) @@ -364,7 +364,7 @@ <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>IsisFish</name> + <name>ISIS-Fish</name> <description>Simulateur de pecherie complexe.</description> <inceptionYear>1999</inceptionYear> Modified: branches/4.3.0-log4j2/src/main/assembly/bin.xml =================================================================== --- branches/4.3.0-log4j2/src/main/assembly/bin.xml 2014-08-28 14:25:25 UTC (rev 4101) +++ branches/4.3.0-log4j2/src/main/assembly/bin.xml 2014-08-28 15:52:19 UTC (rev 4102) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2013 Ifremer, CodeLutin, Eric Chatellier + Copyright (C) 1999 - 2014 Ifremer, CodeLutin, Eric Chatellier %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -60,7 +60,7 @@ <directory>src/main/assembly</directory> <outputDirectory /> <includes> - <include>isisfish-log4j.properties</include> + <include>isisfish-log4j.xml</include> </includes> </fileSet> </fileSets> Deleted: branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j.properties =================================================================== --- branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j.properties 2014-08-28 14:25:25 UTC (rev 4101) +++ branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j.properties 2014-08-28 15:52:19 UTC (rev 4102) @@ -1,45 +0,0 @@ -### -# #%L -# IsisFish -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 - 2013 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 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% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# Package level -log4j.logger.fr.ifremer.isisfish=INFO -log4j.logger.analyseplans=INFO -log4j.logger.exports=INFO -log4j.logger.formules=INFO -log4j.logger.rules=INFO -log4j.logger.scripts=INFO -log4j.logger.sensitivity=INFO -log4j.logger.sensitivityexports=INFO -log4j.logger.simulators=INFO - -# Add your configuration here -#log4j.logger.org.nuiton.j2r=DEBUG Added: branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j2.xml =================================================================== --- branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j2.xml (rev 0) +++ branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j2.xml 2014-08-28 15:52:19 UTC (rev 4102) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + %% + Copyright (C) 1999 - 2014 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 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% + --> + +<!-- To use this file, add "-Dlog4j.configurationFile=isisfish-log4j2.xml" on command line --> +<Configuration packages="fr.ifremer.isisfish.logging" strict="true"> + + <Filters> + <SimulationThresholdFilter onMatch="ACCEPT" onMismatch="NEUTRAL" /> + </Filters> + + <Appenders> + + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%5p [%t] (%F:%L) %M - %m%n" /> + </Console> + + <Routing name="SimulationSpecificAppender"> + <Routes pattern="$${ctx:simulationId}"> + + <!-- This route is chosen if ThreadContext has no value for key simulationId. --> + <Route key="${ctx:simulationId}"> + <Null name="Null" /> + </Route> + + <!-- This route is chosen if ThreadContext has a value for simulationId + The value dynamically determines the name of the log file. --> + <Route> + <File name="SimulationFileAppender-${ctx:simulationId}" fileName="${ctx:simulationLogFile}"> + <PatternLayout> + <Pattern>%p|%d{ABSOLUTE}|%F|%L|%M|%m%n</Pattern> + </PatternLayout> + </File> + </Route> + </Routes> + </Routing> + </Appenders> + + <Loggers> + <Logger name="fr.ifremer.isisfish" level="info"/> + <Logger name="org.nuiton" level="warn"/> + <Logger name="exports" level="info"/> + <Logger name="formules" level="info"/> + <Logger name="objectives" level="info"/> + <Logger name="optimizations" level="info"/> + <Logger name="rules" level="info"/> + <Logger name="scripts" level="info"/> + <Logger name="sensitivityanalysis" level="info"/> + <Logger name="sensitivityexports" level="info"/> + <Logger name="simulationplans" level="info"/> + <Logger name="simulators" level="info"/> + + <Root level="error"> + <AppenderRef ref="Console" /> + <AppenderRef ref="SimulationSpecificAppender" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file Property changes on: branches/4.3.0-log4j2/src/main/assembly/isisfish-log4j2.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/4.3.0-log4j2/src/main/assembly/isisfish.bat =================================================================== --- branches/4.3.0-log4j2/src/main/assembly/isisfish.bat 2014-08-28 14:25:25 UTC (rev 4101) +++ branches/4.3.0-log4j2/src/main/assembly/isisfish.bat 2014-08-28 15:52:19 UTC (rev 4102) @@ -1,8 +1,8 @@ @echo off rem Uncomment following 2 lines to easy configure R for ISIS-Fish -rem SET R_HOME=C:\Program Files\R\R-3.0.0 +rem SET R_HOME=C:\Program Files\R\R-3.1.0 rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx900M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx2048M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: branches/4.3.0-log4j2/src/main/assembly/isisfish.sh =================================================================== --- branches/4.3.0-log4j2/src/main/assembly/isisfish.sh 2014-08-28 14:25:25 UTC (rev 4101) +++ branches/4.3.0-log4j2/src/main/assembly/isisfish.sh 2014-08-28 15:52:19 UTC (rev 4102) @@ -1,5 +1,5 @@ #!/bin/bash -MEMORY="-Xmx1024M" +MEMORY="-Xmx2048M" java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt