Author: tchemit Date: 2013-02-26 09:41:43 +0100 (Tue, 26 Feb 2013) New Revision: 2516 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2516 Log: refs #2541: Introduce nuiton-updater module (improve some code and use new ApplicationConfig) Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-02-26 08:15:50 UTC (rev 2515) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-02-26 08:41:43 UTC (rev 2516) @@ -35,8 +35,8 @@ import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.util.config.ArgumentsParserException; import org.nuiton.util.VersionUtil; import java.io.BufferedInputStream; @@ -129,20 +129,20 @@ */ public class ApplicationUpdater { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ApplicationUpdater.class); + /** Logger. */ + private static final Log log = LogFactory.getLog(ApplicationUpdater.class); final static private String SEPARATOR_KEY = "."; - final static public String HTTP_PROXY = "http_proxy"; + public static final String HTTP_PROXY = "http_proxy"; - final static public String URL_KEY = "url"; + public static final String URL_KEY = "url"; - final static public String AUTHENTICATION_KEY = "auth"; + public static final String AUTHENTICATION_KEY = "auth"; - final static public String VERSION_KEY = "version"; + public static final String VERSION_KEY = "version"; - final static public String VERSION_FILE = "version.appup"; + public static final String VERSION_FILE = "version.appup"; protected ApplicationConfig config; @@ -179,8 +179,12 @@ * @param async if true, check is done in background mode * @param callback callback used to interact with updater, can be null */ - public void update(String vfsPropertiesURL, File currentDir, File destDir, boolean async, ApplicationUpdaterCallback callback) { - Updater up = new Updater(config, vfsPropertiesURL, currentDir, destDir, callback); + public void update(String url, + File currentDir, + File destDir, + boolean async, + ApplicationUpdaterCallback callback) { + Updater up = new Updater(config, url, currentDir, destDir, callback); if (async) { Thread thread = new Thread(up, ApplicationUpdater.class.getSimpleName()); thread.start(); @@ -306,7 +310,7 @@ * Par exemple si un fichier se nomme "monApp-1.2/Readme.txt" il se * nommera au final "monApp/Readme.txt" * - * @param proxy le proxy a utiliser pour la connexion a l'url + * @param vfsConfig le proxy a utiliser pour la connexion a l'url * @param info information sur l'application a mettre a jour * @throws Exception */ @@ -345,7 +349,8 @@ * @throws FileSystemException */ protected void deepCopy(FileSystemOptions vfsConfig, - String srcPath, String targetPath) throws FileSystemException { + String srcPath, + String targetPath) throws FileSystemException { FileSystemManager fsManager = VFS.getManager(); FileObject archive = fsManager.resolveFile(srcPath, vfsConfig);