Author: tchemit Date: 2008-03-15 02:55:33 +0000 (Sat, 15 Mar 2008) New Revision: 1346 Removed: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: split module swing en swing-commandline et swing Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-15 02:55:33 UTC (rev 1346) @@ -27,11 +27,11 @@ <properties> <maven.verbose>false</maven.verbose> <!-- Vcs base dir--> - <maven.vcs.src.dir>${basedir}/src</maven.vcs.src.dir> + <!--maven.vcs.src.dir>${basedir}/src</maven.vcs.src.dir--> <!--Source base dir--> - <maven.src.dir>${basedir}/target/src-build</maven.src.dir> + <!--maven.src.dir>${basedir}/target/src-build</maven.src.dir--> <!--Generate base dir--> - <maven.gen.dir>${basedir}/target/gen</maven.gen.dir> + <!--maven.gen.dir>${basedir}/target/gen</maven.gen.dir--> <!--Main class in JAR --> <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> </properties> @@ -41,10 +41,10 @@ <build> <plugins> <!-- Generate phase --> - <plugin> + <!--plugin> <artifactId>maven-antrun-plugin</artifactId> <configuration> - <!-- recopie des fichiers java sources et generes vers src-build/java --> + <tasks> <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> <fileset dir="${maven.gen.dir}/java"/> @@ -62,8 +62,8 @@ </goals> </execution> </executions> - </plugin> - <plugin> + </plugin--> + <!--plugin> <groupId>lutinplugin</groupId> <artifactId>maven-commandline-plugin</artifactId> <version>0.3</version> @@ -93,7 +93,7 @@ </execution> </executions> - </plugin> + </plugin--> <!-- Compile phase --> <plugin> <groupId>lutinplugin</groupId> @@ -116,7 +116,7 @@ <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> <includes> <param>**\/*Action.java</param> </includes> @@ -125,7 +125,7 @@ </excludes> </entry> <entry> - <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> + <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> <includes> <param>SimExplorerTab.java</param> </includes> @@ -140,7 +140,7 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <configuration> + <!--configuration> <entries> <entry> <specificGoal>parserJava</specificGoal> @@ -151,7 +151,7 @@ </includes> </entry> </entries> - </configuration> + </configuration--> </execution> </executions> </plugin> @@ -202,14 +202,19 @@ <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-swing-jaxx</artifactId> <version>0.1-SNAPSHOT</version> - </dependency> + </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-commandline</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> <!-- librairie commandline --> - <dependency> + <!--dependency> <groupId>lutinlib</groupId> <artifactId>lutincommandline</artifactId> <version>0.1-SNAPSHOT</version> <scope>compile</scope> - </dependency> + </dependency--> <!-- pour avoir les ejb jboss --> <dependency> <groupId>jboss</groupId> Deleted: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -1,112 +0,0 @@ -############################################################################### -### 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 Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -136,32 +136,6 @@ simexplorer.common.name=name simexplorer.common.value=value simexplorer.common.version=version -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.confirm.changeLanguage=Changing to language ''{0}'' will reset the ui and the history simexplorer.confirm.delete=Confirm delete of ''{0}'' simexplorer.error.login.failed=Remote authentication failed... @@ -171,13 +145,6 @@ simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail -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) simexplorer.tab.detail=Detail simexplorer.tab.detail.tooltip=Screen of details of an element simexplorer.tab.local=Local elements Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-15 02:01:09 UTC (rev 1345) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-15 02:55:33 UTC (rev 1346) @@ -136,32 +136,6 @@ simexplorer.common.name=nom simexplorer.common.value=valeur simexplorer.common.version=version -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.confirm.changeLanguage=Changer vers la langue ''{0}'' va r\u00E9initialiser les interfaces et l''historique simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... @@ -171,13 +145,6 @@ simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail -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) simexplorer.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Liste locale