Author: tchemit Date: 2008-03-15 02:57:11 +0000 (Sat, 15 Mar 2008) New Revision: 1348 Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/java/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/site/ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/test/ Log: split module swing en swing-commandline et swing Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,157 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <artifactId>simexplorer-is-swing-commandline</artifactId> + <name>Swing</name> + + <version>0.1-SNAPSHOT</version> + <description>Java Swing commandline SimExplorer-is application</description> + <packaging>jar</packaging> + + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <maven.verbose>false</maven.verbose> + </properties> + </profile> + </profiles> + + <build> + <plugins> + <!-- Generate phase : this is a fully generated module + At checkout, there is no source java files, and the + ${maven.src.dir}/java directory is svn ignored. + + The commandline generator will generate java source files in this + directory, after this, maven compiles as normal and use an unique + source directory, with no trick for generation. + + We use now a fully compiliance maven process:) + --> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-commandline-plugin</artifactId> + <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> + <abstractConfigOptionKey>CONFIG_OPTION_KEY</abstractConfigOptionKey> + <abstractConfigFileOptionKey>CONFIG_FILE_OPTION_KEY</abstractConfigFileOptionKey> + <abstractConfigFilenameConfigKey>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY</abstractConfigFilenameConfigKey> + <concreteConfig>true</concreteConfig> + <actionImplementations> + <!--value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value--> + </actionImplementations> + <configImplementations> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigLocal</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigRemote</value> + </configImplementations> + </configuration> + <executions> + <execution> + <goals> + <goal>genJava</goal> + </goals> + </execution> + </executions> + + </plugin> + <!-- Compile phase --> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>0.2-SNAPSHOT</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <configuration> + <entries> + <entry> + <!--specificGoal>parserJava</specificGoal--> + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/commandline</basedir> + <!--includes> + <param>**\/*Option*.java</param> + <param>**\/*Config*.java</param> + </includes--> + </entry> + </entries> + </configuration> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <!--id>java</id--> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + + </execution> + </executions> + </plugin> + <!-- Package phase --> + <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/dependency</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + <addClasspath>true</addClasspath> + <addExtensions /> + <classpathPrefix>./dependency/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin--> + </plugins> + </build> + + <dependencies> + <!-- librairie commandline --> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,112 @@ +############################################################################### +### Option definitions ######################################################## +############################################################################### + +### +### common options (TODO should be in commandline project) +### +showConfig.option.definition=--show-config {0,1} <main|local|remote> [all|tec] +editConfig.option.definition=--edit-config +configFile.option.definition=--config-file <configFile:File> +config.option.definition=--config * [main|local|remote] <key:String> <value:String> +help.option.definition=--help|-h +resetConfig.option.definition=--resetConfig +ui.option.definition=--ui <value:Boolean> + +### +### others options TODO +### + +############################################################################### +### 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=jaxx.util.SimplePaginationEnum:_5 +main.config.modifiers.localSizor= + +main.config.definition.remoteSizor=jaxx.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 Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-en_GB.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,33 @@ +simexplorer.config.local.data.description=Local database data directory +simexplorer.config.local.db.description=Local database directory +simexplorer.config.local.description=Local server configuration +simexplorer.config.local.optimizePeriod.description=Optimize period (Lucene) +simexplorer.config.main.autoConnect.description=Flag to auto connect to remote server at init time +simexplorer.config.main.configFileName.description=The path of the configuration file +simexplorer.config.main.debugMode.description=Debug mode +simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.localSizor.description=number of result to display by page in local list +simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list +simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab +simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab +simexplorer.config.main.siteURL.description=Simexplorer-is site URL +simexplorer.config.main.userFirstName.description=User first name +simexplorer.config.main.userLastName.description=User last name +simexplorer.config.main.userLocale.description=User locale +simexplorer.config.main.userMail.description=User email adress +simexplorer.config.main.version.description=Version of application +simexplorer.config.remote.URI.description=URI of the remote storage service +simexplorer.config.remote.description=Remote server configuration +simexplorer.config.remote.login.description=User login to remote server +simexplorer.config.remote.password.description=User password to connect remote server +simexplorer.config.remote.proxyLogin.description=login to proxy host +simexplorer.config.remote.proxyPassword.description=password to proxy host +simexplorer.config.remote.useAuthenticationProxy.description=use an anthenticated proxy +simexplorer.config.remote.useProxy.description=use a proxy host toreach remote server +simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. +simexplorer.option.description.configFile=configuration's file +simexplorer.option.description.editConfig=to launch UI of configuration modifier +simexplorer.option.description.help=Show this help +simexplorer.option.description.resetConfig=Reset user configuration. +simexplorer.option.description.showConfig=See configuration details +simexplorer.option.description.ui=launch or not user interface (value) Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/i18n/simexplorer-is-swing-commandline-fr_FR.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -0,0 +1,33 @@ +simexplorer.config.local.data.description=R\u00E9pertoire des donn\u00E9es de la base locale +simexplorer.config.local.db.description=R\u00E9pertoire de la base locale +simexplorer.config.local.description=Configuration du serveur local +simexplorer.config.local.optimizePeriod.description=La p\u00E9riode optimale (Lucene) +simexplorer.config.main.autoConnect.description=Se connecter automatiquement au d\u00E9marrage +simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration +simexplorer.config.main.debugMode.description=Mode debug +simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale +simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante +simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local +simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant +simexplorer.config.main.siteURL.description=L'URL du site de Simexplorer-is +simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur +simexplorer.config.main.userLastName.description=Le nom de l'utilisateur +simexplorer.config.main.userLocale.description=La langue de l'utilisateur +simexplorer.config.main.userMail.description=Le courriel de l'utilisateur +simexplorer.config.main.version.description=La version du logiciel +simexplorer.config.remote.URI.description=l'uri du service distant +simexplorer.config.remote.description=Configuration du serveur distant +simexplorer.config.remote.login.description=Le login de l'utilisateur au service distant +simexplorer.config.remote.password.description=Le mot de passe utilisateur (non visible) au serveur distant +simexplorer.config.remote.proxyLogin.description=Login proxy +simexplorer.config.remote.proxyPassword.description=Mot de passe proxy +simexplorer.config.remote.useAuthenticationProxy.description=utilise une authentification sur le proxy +simexplorer.config.remote.useProxy.description=utilise un proxy pour atteindre le serveur distant +simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. +simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 +simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.help=Show this help +simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. +simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration +simexplorer.option.description.ui=launch or not user interface (value) Added: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties (rev 0) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing-commandline/src/resources/log4j.properties 2008-03-15 02:57:11 UTC (rev 1348) @@ -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 + +