- Simexplorer-si-commits - mailman.cloud.codelutin.com

r1385 - in trunk/simexplorer-is: simexplorer-is-swing-commandline/src/resources simexplorer-is-swing-generated/src/resources
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 10:22:30 +0000 (Tue, 18 Mar 2008) New Revision: 1385 Added: trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/log4j.properties Removed: trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties Log: Moving jaxx and commandline in same module Deleted: trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties 2008-03-18 10:22:07 UTC (rev 1384) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties 2008-03-18 10:22:30 UTC (rev 1385) @@ -1,12 +0,0 @@ -# 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.cemagref.simexplorer.is=INFO -log4j.logger.org.codelutin=INFO - - Copied: trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/log4j.properties (from rev 1384, trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/log4j.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/log4j.properties 2008-03-18 10:22:30 UTC (rev 1385) @@ -0,0 +1,12 @@ +# 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.cemagref.simexplorer.is=INFO +log4j.logger.org.codelutin=INFO + +

1 0

r1384 - in trunk/simexplorer-is: simexplorer-is-swing-commandline/src/resources simexplorer-is-swing-generated/src/resources
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 10:22:07 +0000 (Tue, 18 Mar 2008) New Revision: 1384 Added: trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties Removed: trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties Log: Moving jaxx and commandline in same module Deleted: trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-18 10:21:11 UTC (rev 1383) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-18 10:22:07 UTC (rev 1384) @@ -1,99 +0,0 @@ -############################################################################### -### Option definitions ######################################################## -############################################################################### - -# TODO definie them - -############################################################################### -### Local configuration definition ############################################ -############################################################################### - -local.config.definition.db=java.io.File:/var/local/simexplorer/local-db -local.config.modifiers.db=mandatory - -local.config.definition.optimizePeriod=java.lang.Integer:3600 -local.config.modifiers.optimizePeriod=mandatory - -local.config.definition.data=java.io.File:/var/local/simexplorer/local-data -local.config.modifiers.data=mandatory - -############################################################################### -### Remote configuration definition ########################################### -############################################################################### - -remote.config.definition.login=java.lang.String -remote.config.modifiers.login=mandatory - -remote.config.definition.password=java.lang.String -remote.config.modifiers.password= - -remote.config.definition.URI=java.net.URI:jnp://localhost:1099 -remote.config.modifiers.URI=static,mandatory - -remote.config.definition.useProxy=java.lang.Boolean:False -remote.config.modifiers.useProxy= - -remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False -remote.config.modifiers.useAuthenticationProxy= - -remote.config.definition.proxyLogin=java.lang.String -remote.config.modifiers.proxyLogin= - -remote.config.definition.proxyPassword=java.lang.String -remote.config.modifiers.proxyPassword= - -############################################################################### -### Main configuration definition ############################################# -############################################################################### - -### -### Application global properties -### -main.config.definition.configFileName=java.io.File:.simexplorer-si-1 -main.config.modifiers.configFileName=final,mandatory,transient - -main.config.definition.debugMode=java.lang.Boolean:false -main.config.modifiers.debugMode=mandatory - -main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 -main.config.modifiers.version=final,static,mandatory - -main.config.definition.siteURL=java.net.URL:http://simexplorer-si.labs.libre-entreprise.org -main.config.modifiers.siteURL=final,static,mandatory - -#main.config.definition.smtpServer=java.lang.String:smtp -#main.config.modifiers.smtpServer=mandatory - -### -### Application preferences -### -main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 -main.config.modifiers.localSizor= - -main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 -main.config.modifiers.remoteSizor= - -main.config.definition.showLocalTab=java.lang.Boolean:True -main.config.modifiers.showLocalTab= - -main.config.definition.showRemoteTab=java.lang.Boolean:False -main.config.modifiers.showRemoteTab= - -main.config.definition.autoConnect=java.lang.Boolean:False -main.config.modifiers.autoConnect= - -### -### user properties -### - -main.config.definition.userFirstName=java.lang.String -main.config.modifiers.userFirstName=mandatory - -main.config.definition.userLocale=org.codelutin.i18n.LocaleEnum:fr -main.config.modifiers.userLocale=mandatory - -main.config.definition.userLastName=java.lang.String -main.config.modifiers.userLastName=mandatory - -main.config.definition.userMail=java.lang.String -main.config.modifiers.userMail=mandatory Copied: trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties (from rev 1383, trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties 2008-03-18 10:22:07 UTC (rev 1384) @@ -0,0 +1,99 @@ +############################################################################### +### Option definitions ######################################################## +############################################################################### + +# TODO definie them + +############################################################################### +### Local configuration definition ############################################ +############################################################################### + +local.config.definition.db=java.io.File:/var/local/simexplorer/local-db +local.config.modifiers.db=mandatory + +local.config.definition.optimizePeriod=java.lang.Integer:3600 +local.config.modifiers.optimizePeriod=mandatory + +local.config.definition.data=java.io.File:/var/local/simexplorer/local-data +local.config.modifiers.data=mandatory + +############################################################################### +### Remote configuration definition ########################################### +############################################################################### + +remote.config.definition.login=java.lang.String +remote.config.modifiers.login=mandatory + +remote.config.definition.password=java.lang.String +remote.config.modifiers.password= + +remote.config.definition.URI=java.net.URI:jnp://localhost:1099 +remote.config.modifiers.URI=static,mandatory + +remote.config.definition.useProxy=java.lang.Boolean:False +remote.config.modifiers.useProxy= + +remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False +remote.config.modifiers.useAuthenticationProxy= + +remote.config.definition.proxyLogin=java.lang.String +remote.config.modifiers.proxyLogin= + +remote.config.definition.proxyPassword=java.lang.String +remote.config.modifiers.proxyPassword= + +############################################################################### +### Main configuration definition ############################################# +############################################################################### + +### +### Application global properties +### +main.config.definition.configFileName=java.io.File:.simexplorer-si-1 +main.config.modifiers.configFileName=final,mandatory,transient + +main.config.definition.debugMode=java.lang.Boolean:false +main.config.modifiers.debugMode=mandatory + +main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 +main.config.modifiers.version=final,static,mandatory + +main.config.definition.siteURL=java.net.URL:http://simexplorer-si.labs.libre-entreprise.org +main.config.modifiers.siteURL=final,static,mandatory + +#main.config.definition.smtpServer=java.lang.String:smtp +#main.config.modifiers.smtpServer=mandatory + +### +### Application preferences +### +main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 +main.config.modifiers.localSizor= + +main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 +main.config.modifiers.remoteSizor= + +main.config.definition.showLocalTab=java.lang.Boolean:True +main.config.modifiers.showLocalTab= + +main.config.definition.showRemoteTab=java.lang.Boolean:False +main.config.modifiers.showRemoteTab= + +main.config.definition.autoConnect=java.lang.Boolean:False +main.config.modifiers.autoConnect= + +### +### user properties +### + +main.config.definition.userFirstName=java.lang.String +main.config.modifiers.userFirstName=mandatory + +main.config.definition.userLocale=org.codelutin.i18n.LocaleEnum:fr +main.config.modifiers.userLocale=mandatory + +main.config.definition.userLastName=java.lang.String +main.config.modifiers.userLastName=mandatory + +main.config.definition.userMail=java.lang.String +main.config.modifiers.userMail=mandatory

1 0

r1383 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: glandais Date: 2008-03-18 10:21:11 +0000 (Tue, 18 Mar 2008) New Revision: 1383 Added: trunk/simexplorer-is/simexplorer-is-swing-generated/ Removed: trunk/simexplorer-is/simexplorer-is-swing-jaxx/ Log: Moving jaxx and commandline in same module Copied: trunk/simexplorer-is/simexplorer-is-swing-generated (from rev 1382, trunk/simexplorer-is/simexplorer-is-swing-jaxx)

1 0

r1382 - in trunk/simexplorer-is: simexplorer-is-entities simexplorer-is-service
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 00:21:56 +0000 (Tue, 18 Mar 2008) New Revision: 1382 Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-service/pom.xml Log: process-classes phase for i18n plugin to use compiled classes Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-03-18 00:12:57 UTC (rev 1381) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2008-03-18 00:21:56 UTC (rev 1382) @@ -92,7 +92,7 @@ </configuration> <executions> <execution> - <phase>compile</phase> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-03-18 00:12:57 UTC (rev 1381) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-03-18 00:21:56 UTC (rev 1382) @@ -31,7 +31,7 @@ </configuration> <executions> <execution> - <phase>compile</phase> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> <goal>gen</goal>

1 0

r1381 - trunk/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 00:12:57 +0000 (Tue, 18 Mar 2008) New Revision: 1381 Modified: trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh Log: final Modified: trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh 2008-03-18 00:12:46 UTC (rev 1380) +++ trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh 2008-03-18 00:12:57 UTC (rev 1381) @@ -1,15 +1,20 @@ #!/bin/bash + + function try() { - _try "mvn -o process-classes" "0" $1 - _try "mvn -o process-classes -Di18n.detectea=true" "1" $1 - _try "mvn -o process-classes -Di18n.ea=true" "2" $1 + sleep 2 + _try "mvn -o $mvnCommand" "0" $1 + _try "mvn -o $mvnCommand -Di18n.detectea=true" "1" $1 + _try "mvn -o $mvnCommand -Di18n.ea=true" "2" $1 } function try1() { - _try "mvn -o process-classes -Di18n.detectea=true" "3" $1 - _try "mvn -o process-classes -Di18n.ea=true" "4" $1 - _try "mvn -o process-classes" "5" $1 + sleep 2 + _try "mvn -o $mvnCommand -Di18n.detectea=true" "3" $1 + _try "mvn -o $mvnCommand -Di18n.ea=true" "4" $1 + _try "mvn -o $mvnCommand" "5" $1 + } function _try() { @@ -30,13 +35,14 @@ echo "[INFO] $_command round $2 in $_file" >> $result eval $_realCommand - grep -e "i18n." $_file| grep success >> $result + grep -e "i18n." $_file| grep -v parse >> $result if [ `grep -e "BUILD SUC" $_file | wc -l ` != 1 ]; then echo "error!" cat $result exit 1 fi grep BUILD $_file >> $result + grep second $_file grep second $_file >> $result grep Memor $_file >> $result echo "--------------------------------------------------------------------------------" >> $result @@ -45,10 +51,14 @@ result=$0.log -try 2 +mvnCommand="clean install" +try 1 -sleep 5 +mvnCommand="install" +try 1 +mvnCommand="clean install" try1 1 -#cat $result \ No newline at end of file +mvnCommand="install" +try1 1

1 0

r1380 - trunk/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 18 Mar '08

18 Mar '08

Author: tchemit Date: 2008-03-18 00:12:46 +0000 (Tue, 18 Mar 2008) New Revision: 1380 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml Log: oups... Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-17 23:32:49 UTC (rev 1379) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-18 00:12:46 UTC (rev 1380) @@ -92,8 +92,8 @@ <bundles> <param>fr_FR</param> <param>en_GB</param> - <ea>true</ea> </bundles> + <ea>true</ea> </configuration> <executions> <execution>

1 0

r1379 - trunk/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 17 Mar '08

17 Mar '08

Author: tchemit Date: 2008-03-17 23:32:49 +0000 (Mon, 17 Mar 2008) New Revision: 1379 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml Log: use i18n annotation filtering Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-17 23:11:03 UTC (rev 1378) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-17 23:32:49 UTC (rev 1379) @@ -92,6 +92,7 @@ <bundles> <param>fr_FR</param> <param>en_GB</param> + <ea>true</ea> </bundles> </configuration> <executions>

1 0

r1378 - trunk/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 17 Mar '08

17 Mar '08

Author: tchemit Date: 2008-03-17 23:11:03 +0000 (Mon, 17 Mar 2008) New Revision: 1378 Added: trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh Log: script for i18n tests (should be remove soon) Added: trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh 2008-03-17 23:11:03 UTC (rev 1378) @@ -0,0 +1,54 @@ +#!/bin/bash + +function try() { + _try "mvn -o process-classes" "0" $1 + _try "mvn -o process-classes -Di18n.detectea=true" "1" $1 + _try "mvn -o process-classes -Di18n.ea=true" "2" $1 +} + +function try1() { + _try "mvn -o process-classes -Di18n.detectea=true" "3" $1 + _try "mvn -o process-classes -Di18n.ea=true" "4" $1 + _try "mvn -o process-classes" "5" $1 +} + +function _try() { + i=1 + _command=$1 + echo "--------------------------------------------------------------------------------" + echo "[INFO] start $_command " + while [ $i -le $3 ]; do + filter "$_command" "$2-$i" + i=$(($i + 1)) + done +} +function filter() { + _command=$1 + _file=/tmp/i18n-benchmark-$2.log + _realCommand="$_command | grep -v bundle | grep -v xecut | grep -v i18n:ge > $_file" + echo "[INFO] round $2 in $_file" + echo "[INFO] $_command round $2 in $_file" >> $result + + eval $_realCommand + grep -e "i18n." $_file| grep success >> $result + if [ `grep -e "BUILD SUC" $_file | wc -l ` != 1 ]; then + echo "error!" + cat $result + exit 1 + fi + grep BUILD $_file >> $result + grep second $_file >> $result + grep Memor $_file >> $result + echo "--------------------------------------------------------------------------------" >> $result +# sleep 5 +} + +result=$0.log + +try 2 + +sleep 5 + +try1 1 + +#cat $result \ No newline at end of file Property changes on: trunk/simexplorer-is/simexplorer-is-swing/i18n-benchmark.sh ___________________________________________________________________ Name: svn:executable + *

1 0

r1377 - trunk/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org 17 Mar '08

17 Mar '08

Author: tchemit Date: 2008-03-17 23:10:11 +0000 (Mon, 17 Mar 2008) New Revision: 1377 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml Log: simplify commandline config + i18n at process-classes phase to have compiled classes :) Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-17 23:09:14 UTC (rev 1376) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-17 23:10:11 UTC (rev 1377) @@ -32,6 +32,9 @@ <build> <plugins> +  <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -67,7 +70,6 @@ <version>0.3</version> <configuration> <prefix>SimExplorer</prefix> - <i18nPrefix>simexplorer</i18nPrefix> <source>${maven.src.dir}/resources/commandline.properties</source> <out>${maven.src.dir}/java</out> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> @@ -94,6 +96,7 @@ </configuration> <executions> <execution> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> <goal>gen</goal>

1 0

r1376 - trunk/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 17 Mar '08

17 Mar '08

Author: tchemit Date: 2008-03-17 23:09:14 +0000 (Mon, 17 Mar 2008) New Revision: 1376 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: split i18n actions Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-17 23:07:39 UTC (rev 1375) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-17 23:09:14 UTC (rev 1376) @@ -43,12 +43,14 @@ <bundles> <param>fr_FR</param> <param>en_GB</param> - </bundles> + </bundles> +  +  </configuration> <executions> <execution> - <phase>compile</phase> - <id>JavaActionConfig</id> + <phase>process-classes</phase> + <id>javaActionConfig</id> <goals> <goal>parserJavaActionConfig</goal> </goals> @@ -57,7 +59,6 @@ <entries> <entry> <basedir>${maven.src.dir}/java</basedir> -  <includes> <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java</param> </includes> @@ -65,11 +66,23 @@ <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java</param> </excludes> </entry> + </entries> + </configuration> + </execution> + <execution> + <phase>process-classes</phase> + <id>javaTabConfig</id> + <goals> + <goal>parserJavaTabConfig</goal> + </goals> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> <entry> <basedir>${maven.src.dir}/java</basedir> <includes> <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java</param> - </includes> + </includes> </entry> </entries> </configuration>

1 0