Author: chatellier Date: 2009-10-27 10:38:37 +0000 (Tue, 27 Oct 2009) New Revision: 2695 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java Log: Add configurable entries in UI. Remove duplicated ssh key configuration. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/changelog.txt 2009-10-27 10:38:37 UTC (rev 2695) @@ -1,6 +1,7 @@ isis-fish (3.3.0.0) stable; urgency=low - * Global VCS improvement (code, script UI, inptu UI) + * Remove duplicated SSH key configuration, common configuration for VCS and caparmor + * Global VCS improvement (code, script UI, input UI) * Update to svnkit 1.3.1 * Unification of error frames * Move codelutin librairies to nuiton.org Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-27 10:38:37 UTC (rev 2695) @@ -813,7 +813,9 @@ "smtpServer", Option.SMTP_SERVER.key, "userMail", Option.USER_MAIL.key, "userName", Option.USER_NAME.key, - "vcs.keyFile", Option.VCS_SSH_KEY_FILE.key, + "vcs.keyFile", Option.SSH_KEY_FILE.key, + "vcs.keyFile", Option.SSH_KEY_FILE.key, + "vcs.ssh.keyFile", Option.SSH_KEY_FILE.key, "vcs.localDatabasePath", Option.DATABASE_DIRECTORY.key, // on supprime car non compatible, les valeurs par defaut sont tres bien "localSimulator", null, @@ -929,16 +931,16 @@ DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"), - // TODO remove duplicated ssh key configuration + // SSH (global, for both VCS and caparmor) SSH_KEY_FILE("ssh.key.file", _("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), - SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), - SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), + //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), + //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), // can be None, CVS or SVN. only None or SVN work VCS_TYPE(VCS.VCS_TYPE, _("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file - VCS_PROTOCOLE(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"), - VCS_SSH_KEY_FILE(VCS.VCS_SSH_KEY_FILE, _("isisfish.config.vcs.keyFile.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), + VCS_PROTOCOL(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"), + //VCS_SSH_KEY_FILE(VCS.VCS_SSH_KEY_FILE, _("isisfish.config.vcs.keyFile.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), // user login to access vcs VCS_USER_NAME(VCS.VCS_USER_NAME, _("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, _("isisfish.config.vcs.userPassword.description"), ""), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-10-27 10:38:37 UTC (rev 2695) @@ -105,9 +105,37 @@ _("isisfish.config.category.main"), _("isisfish.config.category.main.description"), IsisConfig.Option.CONFIG_FILE, - IsisConfig.Option.LOCALE + IsisConfig.Option.DATABASE_DIRECTORY, + IsisConfig.Option.COMPILATION_DIRECTORY, + IsisConfig.Option.JAVADOC_DIRECTORY, + IsisConfig.Option.BACKUP_DIRECTORY, + IsisConfig.Option.DEFAULT_EXPORT_DIRECTORY, + IsisConfig.Option.LOCALE, + IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR ); + // categorie versionning + model.addCategory( + _("isisfish.config.category.versioning"), + _("isisfish.config.category.versioning.description"), + IsisConfig.Option.VCS_TYPE, + IsisConfig.Option.VCS_PROTOCOL, + IsisConfig.Option.VCS_USER_NAME, + IsisConfig.Option.VCS_USER_PASSWORD, + IsisConfig.Option.VCS_HOST_NAME, + IsisConfig.Option.VCS_PATH + ); + + // categorie misc + model.addCategory( + _("isisfish.config.category.misc"), + _("isisfish.config.category.misc.description"), + IsisConfig.Option.SSH_KEY_FILE, + IsisConfig.Option.USER_NAME, + IsisConfig.Option.SMTP_SERVER, + IsisConfig.Option.USER_MAIL + ); + ConfigUI configUI = ConfigUIBuilder.newConfigUI(new DefaultJAXXContext(this), model, _("isisfish.config.category.main")); ConfigUIBuilder.showConfigUI(configUI, this, false); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2009-10-27 10:38:37 UTC (rev 2695) @@ -63,12 +63,12 @@ * can be http, ssh, pserver, ... */ public static final String VCS_PROTOCOL = "vcs.protocol"; - - /** + + /* * ssh key file - */ - public static final String VCS_SSH_KEY_FILE = "vcs.ssh.keyFile"; - + * + public static final String VCS_SSH_KEY_FILE = "vcs.ssh.keyFile";*/ + /** * remote server adresse (ip or serveur name) ex: labs.libre-entreprise.org */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2009-10-27 10:38:37 UTC (rev 2695) @@ -68,7 +68,7 @@ String protocol = config.getOption(VCS.VCS_PROTOCOL); String host = config.getOption(VCS.VCS_HOST_NAME); String path = config.getOption(VCS.VCS_PATH); - File sshKeyFile = config.getOptionAsFile(VCS.VCS_SSH_KEY_FILE); + File sshKeyFile = config.getSSHPrivateKeyFilePath(); String login = config.getOption(VCS.VCS_USER_NAME); String password = config.getOption(VCS.VCS_USER_PASSWORD); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-10-27 10:38:37 UTC (rev 2695) @@ -142,6 +142,10 @@ isisfish.common.zone=Zone isisfish.config.category.main=Main isisfish.config.category.main.description=Main configuration +isisfish.config.category.misc=Misc +isisfish.config.category.misc.description=Miscealenous +isisfish.config.category.versioning=VCS +isisfish.config.category.versioning.description=Versioning system isisfish.config.database.lockmode.description= isisfish.config.main.compileDirectory.description= isisfish.config.main.configFileName.description= Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-27 10:38:37 UTC (rev 2695) @@ -142,6 +142,10 @@ isisfish.common.zone=Zone isisfish.config.category.main=Globale isisfish.config.category.main.description=Configuration globale +isisfish.config.category.misc=Divers +isisfish.config.category.misc.description=Divers +isisfish.config.category.versioning=VCS +isisfish.config.category.versioning.description=Gestionnaire de version isisfish.config.database.lockmode.description= isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-10-26 18:17:09 UTC (rev 2694) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2009-10-27 10:38:37 UTC (rev 2695) @@ -84,7 +84,7 @@ System.setProperty(IsisConfig.Option.LAUNCH_UI.key, "false"); System.setProperty(IsisConfig.Option.DATABASE_DIRECTORY.key, dirDatabase.getAbsolutePath()); System.setProperty(IsisConfig.Option.SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_dsa"); - System.setProperty(IsisConfig.Option.VCS_SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_rsa"); + //System.setProperty(IsisConfig.Option.VCS_SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_rsa"); IsisFish.init(); IsisFish.initVCS();