Author: tchemit Date: 2008-02-20 23:12:38 +0000 (Wed, 20 Feb 2008) New Revision: 1157 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/ Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: refactoring config to allowed speficif config file in local service local databse as properties of application configuration localDb,localData,localOptimizePeriod Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-20 23:09:00 UTC (rev 1156) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-20 23:12:38 UTC (rev 1157) @@ -68,7 +68,7 @@ */ public static StorageService getService(SimExplorerContext context, boolean remote) throws UnreachableServiceException { StorageService service; - service = remote ? getRemoteStorageService(context) : getLocalStorageService(); + service = remote ? getRemoteStorageService(context) : getLocalStorageService(context); if (service == null) { throw new UnreachableServiceException("could not find service " + (remote ? "remote" : "local")); } @@ -190,14 +190,17 @@ } } - /** @return le service de storage locale */ - protected static StorageService getLocalStorageService() { + /** + * @param context le context de l'application + * @return le service de storage locale + */ + protected static StorageService getLocalStorageService(SimExplorerContext context) { if (storageService == null) { if (mock) { return storageService = new MockStorageServiceImpl(false); } try { - storageService = new StorageServiceClient(); + storageService = new StorageServiceClient(context.getConfig().getSource().toString(),"local"); } catch (Exception e) { throw new SimExplorerRuntimeException(e); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-20 23:09:00 UTC (rev 1156) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-20 23:12:38 UTC (rev 1157) @@ -73,6 +73,18 @@ main.config.modifiers.remoteURI=static,mandatory ### +### Local service configuration +### +main.config.definition.localDb=java.io.File:/var/local/simexplorer/local-db +main.config.modifiers.localDb=mandatory + +main.config.definition.localOptimizePeriod=java.lang.Integer:3600 +main.config.modifiers.localOptimizePeriod=mandatory + +main.config.definition.localData=java.io.File:/var/local/simexplorer/local-data +main.config.modifiers.localData=mandatory + +### ### user properties ### main.config.definition.userCountry=org.codelutin.i18n.CountryEnum:FR Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-20 23:09:00 UTC (rev 1156) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-20 23:12:38 UTC (rev 1157) @@ -147,6 +147,9 @@ simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.localData.description=Local database data directory +simexplorer.config.main.localDb.description=Local database directory +simexplorer.config.main.localOptimizePeriod.description=Optimize period (Lucene) simexplorer.config.main.localSizor.description=number of result to display by page in local list simexplorer.config.main.remoteLogin.description=User login to remote server simexplorer.config.main.remotePassword.description=User password to connect remote server Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-20 23:09:00 UTC (rev 1156) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-20 23:12:38 UTC (rev 1157) @@ -147,6 +147,9 @@ simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.localData.description=Répertoire des données de la base locale +simexplorer.config.main.localDb.description=Répertoire de la base locale +simexplorer.config.main.localOptimizePeriod.description=La période optimale (Lucene) simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale simexplorer.config.main.remoteLogin.description=Le login de l'utilisateur au service distant simexplorer.config.main.remotePassword.description=Le mot de passe utilisateur (non visible) au serveur distant