Author: tchemit Date: 2012-03-23 11:34:10 +0100 (Fri, 23 Mar 2012) New Revision: 402 Url: http://forge.codelutin.com/repositories/revision/echobase/402 Log: fixes 1017 Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh trunk/echobase-services/src/test/resources/log4j.properties trunk/echobase-ui/src/main/env/prod/resources/log4j.xml Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-03-23 10:34:10 UTC (rev 402) @@ -1 +1,2 @@ -java -jar echobase-ui-${project.version}.war \ No newline at end of file +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=./logs" +java %ECHOBASE_OPTS% -jar echobase-ui-${project.version}.war \ No newline at end of file Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-03-23 10:34:10 UTC (rev 402) @@ -1,11 +1,8 @@ #!/bin/sh -MX=512M +OLDPWD=`pwd` cd `dirname $0` -if [ -n "$JAVA_HOME" ]; then - $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar echobase-ui-${project.version}.war $* -else - java -Xmx$MX -Xms$MX -jar echobase-ui-${project.version}.war $* -fi +CURRENTPWD=`pwd` +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" +java $ECHOBASE_OPTS -jar echobase-ui-0.4-SNAPSHOT.war $* cd "$OLDPWD" - Modified: trunk/echobase-services/src/test/resources/log4j.properties =================================================================== --- trunk/echobase-services/src/test/resources/log4j.properties 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/test/resources/log4j.properties 2012-03-23 10:34:10 UTC (rev 402) @@ -31,4 +31,4 @@ # package level log4j.logger.fr.ifremer.echobase=INFO #log4j.logger.fr.ifremer.echobase.services.ReplicateEntityVisitor=DEBUG -log4j.logger.fr.ifremer.echobase.services.importdata.AcousticDataImportService=DEBUG +#log4j.logger.fr.ifremer.echobase.services.importdata.AcousticDataImportService=DEBUG Modified: trunk/echobase-ui/src/main/env/prod/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-03-23 10:34:10 UTC (rev 402) @@ -44,20 +44,7 @@ </layout> </appender> - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/> - </layout> - </appender> - - <logger name="org.nuiton"> + <logger name="org"> <level value="WARN"/> </logger> @@ -68,7 +55,6 @@ <root> <priority value="ERROR"/> <appender-ref ref="FILE"/> - <appender-ref ref="CONSOLE"/> </root> </log4j:configuration>