- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2479 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 28 Jan '13

28 Jan '13

Author: bpoussin Date: 2013-01-28 20:05:28 +0100 (Mon, 28 Jan 2013) New Revision: 2479 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2479 Log: ajout du support de l'authentification Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java 2013-01-28 13:57:54 UTC (rev 2478) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java 2013-01-28 19:05:28 UTC (rev 2479) @@ -74,10 +74,14 @@ * <li>os.arch: l'architecture du systeme d'exploitation sur lequel l'application fonctionne (ex: amd64) * * <h3>format du fichier de properties</h3> - * [osName.][osArch.]appName.version=version de l'application - * [osName.][osArch.]appName.url=url du fichier compresse de la nouvelle version - * (format <a href="http://commons.apache.org/vfs/filesystems.html">commons-vfs2</a>) * + * <li>[osName.][osArch.]appName.version=version de l'application</li> + * <li>[osName.][osArch.]appName.auth=true ou false selon que l'acces a l'url + * demande une authentification a fournir par le callback + * (voir {@link ApplicationUpdaterCallback#updateToDo})</li> + * <li>[osName.][osArch.]appName.url=url du fichier compresse de la nouvelle version + * (format <a href="http://commons.apache.org/vfs/filesystems.html">commons-vfs2</a>)</li> + * * appName est a remplacer par le nom de l'application. Il est possible * d'avoir plusieurs application dans le meme fichier ou plusieurs version * en fonction de l'os et de l'architecture. @@ -134,6 +138,7 @@ final static public String HTTP_PROXY = "http_proxy"; final static public String URL_KEY = "url"; + final static public String AUTHENTICATION_KEY = "auth"; final static public String VERSION_KEY = "version"; final static public String VERSION_FILE = "version.appup"; @@ -197,8 +202,18 @@ * Permet de modifier le repertoire destination ou l'url du zip de * l'application pour une application/version * particuliere ou d'annuler la mise a jour en le supprimant de la map - * qui sera retourne + * qui sera retourne. * + * Si {@link ApplicationInfo#needAuthentication} est vrai, il faut que + * les valeurs {@link ApplicationInfo#login} et {@link ApplicationInfo#password} + * soient renseignees. Si elle ne le sont pas la recuperation de la + * ressource echouera. Pour des raisons de securite vous pouvez souhaiter + * mettre le mot de passe sous une forme encrypte. Dans ce cas il doit + * etre encadrer par '{' et '}'. Pour encrypter le mot de passe + * vous devez utiliser: + * <pre> + * java -cp commons-vfs-2.0.jar org.apache.commons.vfs2.util.EncryptUtil encrypt mypassword + * </pre> * @param appToUpdate liste des applications a mettre a jour * @return null or empty map if we don't want update, otherwize list of * app to update @@ -232,16 +247,25 @@ public String oldVersion; public String newVersion; public String url; + public boolean needAuthentication; + public String login; + public char[] password; public File destDir; - public ApplicationInfo(String name, String oldVersion, String newVersion, String url, File destDir) { + public ApplicationInfo(String name, String oldVersion, String newVersion, String url, File destDir, boolean needAuthentication) { this.name = name; this.oldVersion = oldVersion; this.newVersion = newVersion; this.url = url; + this.needAuthentication = needAuthentication; this.destDir = destDir; } + public void setAuthentication(String login, char[] password) { + this.login = login; + this.password = password; + } + @Override public String toString() { String result = String.format( @@ -301,9 +325,11 @@ if (greater) { String urlString = releaseConfig.getOption( app + SEPARATOR_KEY + URL_KEY); + boolean needAuthentication = releaseConfig.getOptionAsBoolean( + app + SEPARATOR_KEY + AUTHENTICATION_KEY); appToUpdate.put(app, new ApplicationInfo( - app, currentVersion, newVersion, urlString, destDir)); + app, currentVersion, newVersion, urlString, destDir, needAuthentication)); } } @@ -367,7 +393,12 @@ protected void doUpdate(FileSystemOptions vfsConfig, ApplicationInfo info) throws Exception { if (info.destDir != null) { File dest = new File(info.destDir, info.name); - deepCopy(vfsConfig, info.url, dest.getAbsolutePath()); + String url = toVfsURL(info.url); + if (info.needAuthentication) { + StringUtils.replaceOnce(url, "://", + String.format("://%s:%s@", info.login, new String(info.password))); + } + deepCopy(vfsConfig, url, dest.getAbsolutePath()); // ajout du fichier de version File versionFile = new File(dest, VERSION_FILE); @@ -393,7 +424,7 @@ protected void deepCopy(FileSystemOptions vfsConfig, String srcPath, String targetPath) throws FileSystemException { FileSystemManager fsManager = VFS.getManager(); - FileObject archive = fsManager.resolveFile(toVfsURL(srcPath), vfsConfig); + FileObject archive = fsManager.resolveFile(srcPath, vfsConfig); FileObject[] children = archive.getChildren(); if (children.length == 1) {

1 0

r2478 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 28 Jan '13

28 Jan '13

Author: tchemit Date: 2013-01-28 14:57:54 +0100 (Mon, 28 Jan 2013) New Revision: 2478 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2478 Log: fixes #2515: [ApplicationConfig] Get back all detected options Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigHelper.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigHelper.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigHelper.java 2013-01-28 08:28:02 UTC (rev 2477) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigHelper.java 2013-01-28 13:57:54 UTC (rev 2478) @@ -116,31 +116,21 @@ } /** - * Load default options from all config provider found in classpath. + * Load default options from all given config providers. * - * @param config config where to add default options. - * @param classLoader optional classLoader - * @param includes config to include (if none given all is include) - * @param excludes config to exclude (if none given, no exclude) - * @param verbose verbose flag - * @since 2.6.6 + * @param config config where to add default options. + * @param providers providers to use + * @since 2.6.7 */ public static void loadAllDefaultOption(ApplicationConfig config, - ClassLoader classLoader, - Set<String> includes, - Set<String> excludes, - boolean verbose) { + Set<ApplicationConfigProvider> providers) { - Set<ApplicationConfigProvider> providers = getProviders(classLoader, - includes, - excludes, - verbose); for (ApplicationConfigProvider provider : providers) { if (log.isInfoEnabled()) { log.info("Load default options from configuration: " + provider.getName()); } - if (verbose && log.isInfoEnabled()) { + if (log.isInfoEnabled()) { for (ApplicationConfig.OptionDef optionDef : provider.getOptions()) { log.info(" " + optionDef.getKey() + " (" + optionDef.getDefaultValue() + ')'); @@ -148,6 +138,69 @@ } config.loadDefaultOptions(provider.getOptions()); } + } + /** + * Gets all transient options from the given providers. + * + * @param providers providers to inspect + * @return the set of all options that are transient + * @see ApplicationConfig.OptionDef#isTransient() + * @since 2.6.7 + */ + public static Set<ApplicationConfig.OptionDef> getTransientOptions(Set<ApplicationConfigProvider> providers) { + Set<ApplicationConfig.OptionDef> result = new HashSet<ApplicationConfig.OptionDef>(); + for (ApplicationConfigProvider provider : providers) { + for (ApplicationConfig.OptionDef def : provider.getOptions()) { + if (def.isTransient()) { + result.add(def); + } + } + } + return result; } + + + /** + * Gets all final options from the given providers. + * + * @param providers providers to inspect + * @return the set of all options that are final + * @see ApplicationConfig.OptionDef#isFinal() + * @since 2.6.7 + */ + public static Set<ApplicationConfig.OptionDef> getFinalOptions(Set<ApplicationConfigProvider> providers) { + Set<ApplicationConfig.OptionDef> result = new HashSet<ApplicationConfig.OptionDef>(); + for (ApplicationConfigProvider provider : providers) { + for (ApplicationConfig.OptionDef def : provider.getOptions()) { + if (def.isFinal()) { + result.add(def); + } + } + } + return result; + } + + /** + * Get all option keys that should not be saved in the user config file + * from the given options providers. + * <p/> + * Such options are {@code transient} or {@code final}. + * + * @param providers providers to inspect + * @return the set of options key not to store in the config file + * @see ApplicationConfig.OptionDef#isFinal() + * @see ApplicationConfig.OptionDef#isTransient() + * @since 2.6.7 + */ + public static Set<String> getTransientOrFinalOptionKey(Set<ApplicationConfigProvider> providers) { + Set<String> result = new HashSet<String>(); + for (ApplicationConfig.OptionDef def : getTransientOptions(providers)) { + result.add(def.getKey()); + } + for (ApplicationConfig.OptionDef def : getFinalOptions(providers)) { + result.add(def.getKey()); + } + return result; + } }

1 0

r2477 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by tchemit＠users.nuiton.org 28 Jan '13

28 Jan '13

Author: tchemit Date: 2013-01-28 09:28:02 +0100 (Mon, 28 Jan 2013) New Revision: 2477 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2477 Log: move to version 2.6.7 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/nuiton-csv/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/nuiton-profiling/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/nuiton-utils/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/nuiton-validator/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-26 15:57:49 UTC (rev 2476) +++ trunk/pom.xml 2013-01-28 08:28:02 UTC (rev 2477) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.7-SNAPSHOT</version> <modules> <module>nuiton-utils</module>

1 0

r2476 - in trunk/nuiton-profiling/src/main: java/org/nuiton/profiling resources/nuiton-js resources/org/nuiton/profiling/web
by bpoussin＠users.nuiton.org 26 Jan '13

26 Jan '13

Author: bpoussin Date: 2013-01-26 16:57:49 +0100 (Sat, 26 Jan 2013) New Revision: 2476 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2476 Log: - NuitonTrace a un main qui permet de lancer le serveur web - ajout du favicon.ico - meilleur recherche des ressources web (fonctionne mieux) - 404 est bien renvoyer maintenant - on est plus oblig?\195?\169 de mettre /index.html - petit changement d'icone - import des css/js en relatif (ce qui permettra de mettre les ressources web en static sur un serveur) Added: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-26 15:57:49 UTC (rev 2476) @@ -590,9 +590,11 @@ if (requestMethod.equalsIgnoreCase("GET")) { String path = exchange.getRequestURI().getPath(); String file = StringUtils.substringAfterLast(path, "/"); - URL resource = getClass().getClassLoader().getResource(filepath + file); + file = StringUtils.defaultIfBlank(file, "index.html"); + URL resource = getClass().getResource(filepath + file); if (resource == null) { exchange.sendResponseHeaders(404, 0); + exchange.close(); } else { String type = "text/" + StringUtils.substringAfterLast(file, "."); Headers responseHeaders = exchange.getResponseHeaders(); @@ -685,6 +687,7 @@ responseBody.close(); } else { exchange.sendResponseHeaders(404, 0); + exchange.close(); } } Modified: trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties =================================================================== --- trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.properties 2013-01-26 15:57:49 UTC (rev 2476) @@ -1,4 +1,4 @@ debug=false -preProcessors=cssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr +preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr postProcessors=cssVariables,jsMin uriLocators=uri,classpath Added: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/favicon.ico ___________________________________________________________________ Added: svn:mime-type + image/x-icon Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-26 15:57:49 UTC (rev 2476) @@ -7,8 +7,8 @@ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <meta charset="UTF-8"/> - <link href="/profiling-ui-web.css" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="/profiling-ui-web.js"></script> + <link type="text/css" rel="stylesheet" href="profiling-ui-web.css"/> + <script type="text/javascript" src="profiling-ui-web.js"></script> </head> <body> @@ -24,8 +24,8 @@ <input type="text" id="profilingUrl" placeholder="profiling url" value="http://[::1]:4488/"/> </form> <form class="navbar-form pull-left" action="#"> - <button id="addStat"><i class="icon-picture"></i> Add</button> - <button id="clearStat"><i class="icon-remove"></i> Clear</button> + <button id="addStat"><i class="icon-picture icon-large"></i> Add</button> + <button id="clearStat"><i class="icon-trash icon-large"></i> Clear</button> </form> <ul class="nav"> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-26 03:56:54 UTC (rev 2475) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-26 15:57:49 UTC (rev 2476) @@ -173,7 +173,7 @@ var date = title || new Date(); var a = createLinkToLoad(date); - var edit = $('<li class="icon-pencil"></li>').click(function() { + var edit = $('<li class="icon-pencil icon-large blue"></li>').click(function() { var a = $(this).parent().children("a"); var text = a.text(); @@ -208,7 +208,7 @@ input.select(); return false; // false pour que le menu, ne se referme pas }); - var remove = $('<li class="icon-remove"></li>').click(function() { + var remove = $('<li class="icon-trash icon-large red"></li>').click(function() { $(this).parent().remove(); saveDatabase(); });

1 0

r2475 - in trunk/nuiton-profiling/src/site: . apt resources resources/images
by bpoussin＠users.nuiton.org 26 Jan '13

26 Jan '13

Author: bpoussin Date: 2013-01-26 04:56:54 +0100 (Sat, 26 Jan 2013) New Revision: 2475 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2475 Log: ajout d'une copie d'ecran dans la documentation Added: trunk/nuiton-profiling/src/site/apt/screenshot.apt.vm trunk/nuiton-profiling/src/site/resources/ trunk/nuiton-profiling/src/site/resources/images/ trunk/nuiton-profiling/src/site/resources/images/screenshot.png Modified: trunk/nuiton-profiling/src/site/site_fr.xml Added: trunk/nuiton-profiling/src/site/apt/screenshot.apt.vm =================================================================== --- trunk/nuiton-profiling/src/site/apt/screenshot.apt.vm (rev 0) +++ trunk/nuiton-profiling/src/site/apt/screenshot.apt.vm 2013-01-26 03:56:54 UTC (rev 2475) @@ -0,0 +1,34 @@ +~~~ +~~ #%L +~~ Nuiton Utils :: Nuiton Profiling +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2004 - 2010 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ + ---- + Nuiton utils Extra + ---- + ---- + 2009-08-23 + ---- + + Voici un exemple d'utilisation du serveur Web embarqué dans Nuiton-Profiling + +[images/screenshot.png] screenshot Added: trunk/nuiton-profiling/src/site/resources/images/screenshot.png =================================================================== (Binary files differ) Property changes on: trunk/nuiton-profiling/src/site/resources/images/screenshot.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: trunk/nuiton-profiling/src/site/site_fr.xml =================================================================== --- trunk/nuiton-profiling/src/site/site_fr.xml 2013-01-26 03:41:09 UTC (rev 2474) +++ trunk/nuiton-profiling/src/site/site_fr.xml 2013-01-26 03:56:54 UTC (rev 2475) @@ -50,6 +50,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> + <item name="Capture d'écran" href="screenshot.html"/> </menu> <menu name="Téléchargement">

1 0

r2474 - in trunk/nuiton-profiling/src/main: java/org/nuiton/profiling resources/nuiton-js resources/org/nuiton/profiling/web
by bpoussin＠users.nuiton.org 26 Jan '13

26 Jan '13

Author: bpoussin Date: 2013-01-26 04:41:09 +0100 (Sat, 26 Jan 2013) New Revision: 2474 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2474 Log: - ajout de la sauvegarde en base dans le navigateur pour retrouver ses donnees entre deux session. - on peut renommer les snapshots - on effacer des snapshots - suppression des includes inutils JS Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-25 21:35:52 UTC (rev 2473) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2013-01-26 03:41:09 UTC (rev 2474) @@ -765,4 +765,36 @@ // initialise puisqu'on est dans l'init :( init(); } + + /** + * Force le lancement du serveur web, permet d'avoir le serveur sur une + * machine pour monitorer une application qui est sur une autre. L'avantage + * est de pouvoir centraliser les sauvegardes sur le meme domaine web + * @param args le port a utiliser si vide utilise les variables d'environnement + * et en dernier recourrs utilise le port 4488 + */ + static public void main(String... args) { + System.out.println("Starting Nuiton Profiling ..."); + String portString; + if (args != null && args.length > 0) { + portString = args[0]; + } else { + portString = getOption(PORT_OPTION); + } + if (portString == null) { + portString = "4488"; + } + System.out.println("NuitonProfiling web port: " + portString); + if (portString != null) { + try { + int port = Integer.parseInt(portString); + if (port > 0) { + startWebService(port); + } + } catch (Exception eee) { + eee.printStackTrace(System.err); + System.err.println("Can't parse port number: "+ portString); + } + } + } } Modified: trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml =================================================================== --- trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml 2013-01-25 21:35:52 UTC (rev 2473) +++ trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml 2013-01-26 03:41:09 UTC (rev 2474) @@ -2,10 +2,8 @@ <group name='profiling-ui-web'> <group-ref>jquery</group-ref> - <group-ref>bootstrap-responsive</group-ref> - <group-ref>jquery-ui</group-ref> + <group-ref>bootstrap</group-ref> <group-ref>jquery-ui-base</group-ref> - <group-ref>jquery-ui-fr</group-ref>  <group-ref>jqgrid-fr</group-ref> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-25 21:35:52 UTC (rev 2473) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-26 03:41:09 UTC (rev 2474) @@ -15,27 +15,31 @@ <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> -  - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> <a class="brand" href="http://maven-site.nuiton.org/nuiton-utils/nuiton-profiling/index.html"> Nuiton Profiling </a> - <form action="javascript:requestNewData()"> - <input type="text" id="newDatas" placeholder="app url" value="http://[::1]:4488/data"/> - <input id="addStat" type="submit" value="Add"/> + <form class="navbar-form pull-left" action="javascript:requestNewData()"> + <input type="text" id="profilingUrl" placeholder="profiling url" value="http://[::1]:4488/"/> </form> - <input id="clearStat" type="submit" value="Clear"/> + <form class="navbar-form pull-left" action="#"> + <button id="addStat"><i class="icon-picture"></i> Add</button> + <button id="clearStat"><i class="icon-remove"></i> Clear</button> + </form> - Datas: <select id="datas"> - <option label="" value=""></option> - </select> + <ul class="nav"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Data + <b class="caret"></b> + </a> + <ul id="datas" class="dropdown-menu" > + </ul> + </li> + </ul> + </div> </div> </div> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css 2013-01-25 21:35:52 UTC (rev 2473) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css 2013-01-26 03:41:09 UTC (rev 2474) @@ -3,7 +3,11 @@ } form { display: inline; + margin-right: 4px; } +form button { + margin-top: 7px; +} #download { margin-bottom: 5px; } @@ -11,3 +15,9 @@ display: inline-block; width: 250px; } +li.inline { + white-space: nowrap; +} +li.inline a { + display: inline; +} Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-25 21:35:52 UTC (rev 2473) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-26 03:41:09 UTC (rev 2474) @@ -1,9 +1,15 @@ jQuery(document).ready(function($) { - $('#newDatas').val(window.location.origin); + restoreDatabase(); + $('#profilingUrl').val(window.location.origin); + $('#addStat').click(function () { + requestNewData(); + }); + $('#clearStat').click(function () { - var url = $("#newDatas").val() + "/api/clear"; + var url = $("#profilingUrl").val() + "/api/clear"; $.get(url); + addMenuEntry(); }); $('#download').click(function () { @@ -31,18 +37,12 @@ a.href = window.URL.createObjectURL(blob); a.download = 'nuitonprofiling.csv'; a.click(); - window.URL.revokeObjectURL(a.href); + window.setTimeout(function() { + // on delai car sinon, le click a pas le temps de se faire + window.URL.revokeObjectURL(a.href); + }, 1000); }); -$("select#datas").change(function () { - var index = $("select#datas option:selected").val(); - if (index == "") { - loadData({}); - } else { - loadData(datas[index]); - } - }); - getGrid().jqGrid({ datatype: processrequest, mtype: 'POST', @@ -83,9 +83,8 @@ function requestNewData() { - var url = $("#newDatas").val() + "/data"; - var select = $("#datas"); - getNewData(url, select); + var url = $("#profilingUrl").val() + "/data"; + getNewData(url); } function getGrid() { @@ -93,7 +92,6 @@ } var currentData = {}; -var datas = []; /** * Charge les data comme current data et force le rechargement de la grille @@ -108,22 +106,127 @@ * Recupere les donnees d'une instance de Nuiton Profiling et l'ajoute * a la liste des donnees disponibles */ -function getNewData (url, select) { +function getNewData (url) { $.ajax({ type: "GET", url: url, dataType: "jsonp", success: function(data){ - var date = new Date(); - select.append('<option label="'+date+'" value="'+datas.length+'"/>'); - datas.push(data) + addMenuEntry(data); } }); } +/** + * Creer un lien dans le menu + */ +function createLinkToLoad(text) { + var result = $('<a href="#">'+text+'</a>').click(function() { + loadData($(this).parent().data('profiling-data')); + }); + return result; +} +/** + * retourne le menu des snapshot disponible + */ +function getMenu() { + var menu = $("#datas"); + return menu; +} /** + * sauvegarde dans la base local pour pouvoir recuperer les info entre deux sessions + */ +function saveDatabase() { + var db = []; + getMenu().children().each(function (i, e) { + var data = $(this).data('profiling-data'); + var text = $(this).text(); + db.push({text:text, data:data}); + }); + var json = JSON.stringify(db); + localStorage.setItem('profiling', json); +} + +/** + * recuperer les info sauvegardees + */ +function restoreDatabase() { + var json = localStorage.getItem('profiling') || '[]'; + var db = JSON.parse(json); + $.each(db, function(i, e) { + addMenuEntry(e.data, e.text, true); + }); +} + +/** + * Ajoute une entre au menu des snapshot disponible et fait un appel a la + * sauvegarde les donnees dans la base + * + * // TODO retravailler le code, il est vraiment crado :( + */ +function addMenuEntry(data, title, restoration) { + var menu = getMenu(); + var li; + if (data) { + var date = title || new Date(); + + var a = createLinkToLoad(date); + var edit = $('<li class="icon-pencil"></li>').click(function() { + var a = $(this).parent().children("a"); + var text = a.text(); + + var input = $('<input type="text" value="'+text+'"></input>') + .click(function () { + return false; // false pour que le menu, ne se referme pas + }) + .keyup(function (e) { + if (e.keyCode == 13) { + // retour chariot == validation + var text = $(this).val(); + var a = createLinkToLoad(text); + $(this).replaceWith(a); + saveDatabase(); + } else if (e.keyCode == 27) { + // ESC == abandont + var text = $(this).data('old-text'); + var a = createLinkToLoad(text); + $(this).replaceWith(a); + } + }) + .blur(function () { + // on perd le focus == validation + var text = $(this).val(); + var a = createLinkToLoad(text); + $(this).replaceWith(a); + saveDatabase(); + }); + input.data('old-text', text); + a.replaceWith(input); + input.focus(); + input.select(); + return false; // false pour que le menu, ne se referme pas + }); + var remove = $('<li class="icon-remove"></li>').click(function() { + $(this).parent().remove(); + saveDatabase(); + }); + li = $('<li class="inline"></li>'); + li.data("profiling-data", data); + + li.append(a); + li.append(edit); + li.append(remove); + } else { + li = $('<li class="divider"></li>'); + } + menu.append(li); + restoration || saveDatabase(); +} + + +/** * Pour les arbres les parametres sont: * nodeid: le nom du noeud qui a ete ouvert * n_level: le level du noeud qui a ete ouvert

1 0

r2473 - in trunk/nuiton-profiling/src/main/resources: nuiton-js org/nuiton/profiling/web
by bpoussin＠users.nuiton.org 25 Jan '13

25 Jan '13

Author: bpoussin Date: 2013-01-25 22:35:52 +0100 (Fri, 25 Jan 2013) New Revision: 2473 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2473 Log: - amelioration du style du bouton download - ajout des graphes Modified: trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js Modified: trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml =================================================================== --- trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml 2013-01-22 19:23:35 UTC (rev 2472) +++ trunk/nuiton-profiling/src/main/resources/nuiton-js/wro.xml 2013-01-25 21:35:52 UTC (rev 2473) @@ -6,21 +6,16 @@ <group-ref>jquery-ui</group-ref> <group-ref>jquery-ui-base</group-ref> <group-ref>jquery-ui-fr</group-ref> - <group-ref>jqplot</group-ref> -  - <group-ref>jqplot.dateAxisRenderer</group-ref> - <group-ref>jqplot.canvasAxisTickRenderer</group-ref> - <group-ref>jqplot.canvasTextRenderer</group-ref> - <group-ref>jqplot.categoryAxisRenderer</group-ref> - <group-ref>jqplot.cursor</group-ref> - <group-ref>jqplot.highlighter</group-ref> - <group-ref>jqplot.barRenderer</group-ref> -  <group-ref>jqgrid-fr</group-ref> <group-ref>jqgrid</group-ref> +  + <group-ref>jqplot</group-ref> + <group-ref>jqplot.pieRenderer</group-ref> + <group-ref>jqplot.highlighter</group-ref> +  <css>/nuiton-profiling.css</css> <js>/nuiton-profiling.js</js> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-22 19:23:35 UTC (rev 2472) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/index.html 2013-01-25 21:35:52 UTC (rev 2473) @@ -43,8 +43,14 @@ <div class="container"> <div class="well"> - <span id="download">download</span> + <div id="graph"> + <div class="graph" id="graphCall"></div> + <div class="graph" id="graphTime"></div> + <div class="graph" id="graphTimeWithNest"></div> + </div> + <button class="btn btn-primary" id="download"><i class="icon-download"></i> download</button> + <table id="treegrid"></table> <div id="ptreegrid"></div> Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css 2013-01-22 19:23:35 UTC (rev 2472) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.css 2013-01-25 21:35:52 UTC (rev 2473) @@ -4,3 +4,10 @@ form { display: inline; } +#download { + margin-bottom: 5px; +} +.graph { + display: inline-block; + width: 250px; +} Modified: trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js =================================================================== --- trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-22 19:23:35 UTC (rev 2472) +++ trunk/nuiton-profiling/src/main/resources/org/nuiton/profiling/web/nuiton-profiling.js 2013-01-25 21:35:52 UTC (rev 2473) @@ -100,6 +100,7 @@ */ function loadData(data) { currentData = data; + createGraph(currentData); getGrid().trigger("reloadGrid") } @@ -250,3 +251,74 @@ // var result = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() + "." + time.getMilliseconds(); // return result; } + +function createGraph(data) { + var callSum = 0; + var timeSum = 0; + var timeWithNestSum = 0; + var call = []; + var time = []; + var timeWithNest = []; + jQuery.each( data, function(method, info){ + + var shortName = method.replace(/[^\(]*\.([_\w\$]+\.[_\w\$]+).*/, "$1"); + + call.push([shortName, info.call]); + time.push([shortName, info.total]); + timeWithNest.push([shortName, info.total_with_nest]); + + callSum += info.call; + timeSum += info.total; + timeWithNestSum += info.total_with_nest; + }); + + graph('Call','graphCall', call, callSum); + graph('Time','graphTime', time, timeSum); + graph('Time with nest','graphTimeWithNest', timeWithNest, timeWithNestSum); +} + +/** + * @param name titre du graph + * @param id l'identifiant de l'element HTML a utiliser pour mettre le graph + * @param data les donnees de type: [ ['Heavy Industry', 12],['Retail', 9], ...] + * @param total le total de la somme des donnees + */ +function graph(name, id, data, total){ + data.sort(function(a,b) { + var result = a[1] - b[1]; + return result; + }); + data.reverse(); + data = data.slice(0, 5); + + + var others = total; + jQuery.each( data, function(i, info){ + var val = info[1]; + others -= val; + info[1] = val; + }); + + data.push(['others', others]); + + var plot = jQuery.jqplot (id, [data], { + title: name, + seriesDefaults: { + // Make this a pie chart. + renderer: jQuery.jqplot.PieRenderer, + rendererOptions: { + diameter: '200', + showDataLabels: true, + sliceMargin: 5, + startAngle: 180 + } + }, + highlighter: { + show: true, + formatString:'%s', + tooltipLocation:'se', + useAxesFormatters:false + }, + legend: {show:false, location: 's'} + }); +}

1 0

r2472 - trunk/nuiton-profiling/src/site/apt
by bpoussin＠users.nuiton.org 22 Jan '13

22 Jan '13

Author: bpoussin Date: 2013-01-22 20:23:35 +0100 (Tue, 22 Jan 2013) New Revision: 2472 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2472 Log: some bug fix in apt syntaxe Modified: trunk/nuiton-profiling/src/site/apt/index.apt.vm Modified: trunk/nuiton-profiling/src/site/apt/index.apt.vm =================================================================== --- trunk/nuiton-profiling/src/site/apt/index.apt.vm 2013-01-22 19:04:20 UTC (rev 2471) +++ trunk/nuiton-profiling/src/site/apt/index.apt.vm 2013-01-22 19:23:35 UTC (rev 2472) @@ -104,7 +104,7 @@ java -Dnuitonprofiling_webport=4488 ... -------------------------------------------------------------------------------- -..Lors du lancement de la JVM il faut ajouter un agent sur la ligne de commande +Lors du lancement de la JVM il faut ajouter un agent sur la ligne de commande -------------------------------------------------------------------------------- java -javaagent:\${maven_repo}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-${aspectjVersion}.jar ... @@ -124,7 +124,7 @@ mvn jetty:run -------------------------------------------------------------------------------- -Il ne vous reste plus qu'a analyser votre application + Il ne vous reste plus qu'a analyser votre application NuitonTrace pour une application Web lancée dans un Tomcat

1 0

r2471 - trunk/nuiton-profiling
by bpoussin＠users.nuiton.org 22 Jan '13

22 Jan '13

Author: bpoussin Date: 2013-01-22 20:04:20 +0100 (Tue, 22 Jan 2013) New Revision: 2471 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2471 Log: check maven dependency Modified: trunk/nuiton-profiling/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2013-01-22 17:53:43 UTC (rev 2470) +++ trunk/nuiton-profiling/pom.xml 2013-01-22 19:04:20 UTC (rev 2471) @@ -39,9 +39,8 @@ <dependencies> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${project.version}</version> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency>

1 0

r2470 - trunk/nuiton-profiling
by bpoussin＠users.nuiton.org 22 Jan '13

22 Jan '13

Author: bpoussin Date: 2013-01-22 18:53:43 +0100 (Tue, 22 Jan 2013) New Revision: 2470 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2470 Log: changement de signature pour animal-sniffer-maven-plugin utilisation de java16-sun au lieu de java16 :( Il semble que (et en reflechissant c'est logique) que le serveur web annonce dans la jre depuis la 1.6 n'est dispo que dans celui de sun :(. Il faut donc trouver un autre petit serveur web qui interagisse bien avec l'AOP. Modified: trunk/nuiton-profiling/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2013-01-22 17:38:58 UTC (rev 2469) +++ trunk/nuiton-profiling/pom.xml 2013-01-22 17:53:43 UTC (rev 2470) @@ -111,6 +111,22 @@ <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin>

1 0