branch develop updated (57f7b9a -> e3f0d5c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-profiling. See https://gitlab.nuiton.org/nuiton/nuiton-profiling.git from 57f7b9a Update parent pom new 1752dc7 Update libs and fix build. Move to java 8 level. new e3f0d5c #22: Add getter to access StatAndStack#statistics The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e3f0d5cf200824af08137f16a6467f36ea0df93c Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jun 4 21:36:05 2020 +0200 #22: Add getter to access StatAndStack#statistics commit 1752dc7f2f0f7c9728544002cfcf7e9ebb1ac8b0 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jun 4 20:02:27 2020 +0200 Update libs and fix build. Move to java 8 level. Summary of changes: pom.xml | 38 +++++++--------------- .../java/org/nuiton/profiling/NuitonTrace.java | 12 +++---- src/main/java/org/nuiton/profiling/Trace.java | 6 ++-- 3 files changed, 21 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-profiling. See https://gitlab.nuiton.org/nuiton/nuiton-profiling.git commit 1752dc7f2f0f7c9728544002cfcf7e9ebb1ac8b0 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jun 4 20:02:27 2020 +0200 Update libs and fix build. Move to java 8 level. --- pom.xml | 38 +++++++--------------- .../java/org/nuiton/profiling/NuitonTrace.java | 12 +++---- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index d4d5ef9..6d7d372 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Utils :: Nuiton Profiling %% - Copyright (C) 2004 - 2014 CodeLutin + Copyright (C) 2004 - 2020 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 @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.2</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> @@ -81,43 +81,27 @@ <url>https://gitlab.nuiton.org/nuiton/nuiton-profiling</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <!-- redmine project Id --> - <projectId>nuiton-profiling</projectId> - <ciViewId>nuiton-profiling</ciViewId> + <gitlabProjectName>nuiton-profiling</gitlabProjectName> - <aspectjVersion>1.8.2</aspectjVersion> + <aspectjVersion>1.9.5</aspectjVersion> <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <!-- Configure aop --> <maven.surefire.debug> -javaagent:target/lib/aspectjweaver-${aspectjVersion}.jar </maven.surefire.debug> - <!--<maven.surefire.debug>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-1.6.11.jar</maven.surefire.debug>--> <locales>fr</locales> - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - - <javaVersion>1.7</javaVersion> + <javaVersion>1.8</javaVersion> <!-- animalSniffer configuration --> - <signatureArtifactId>java17</signatureArtifactId> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <animal.sniffer.skip>true</animal.sniffer.skip> </properties> <dependencies> @@ -125,19 +109,19 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.7</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.10</version> </dependency> <!-- aspectJ --> @@ -150,7 +134,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.13</version> <scope>test</scope> </dependency> @@ -189,7 +173,7 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.6</version> + <version>1.9.0</version> </plugin> </plugins> </pluginManagement> diff --git a/src/main/java/org/nuiton/profiling/NuitonTrace.java b/src/main/java/org/nuiton/profiling/NuitonTrace.java index 06cbe16..95f099e 100644 --- a/src/main/java/org/nuiton/profiling/NuitonTrace.java +++ b/src/main/java/org/nuiton/profiling/NuitonTrace.java @@ -38,7 +38,7 @@ import org.aspectj.lang.reflect.MethodSignature; /** * Permet de tracer les appels aux methodes. * - * <h1>Mise en place</h1> + * <h2>Mise en place</h2> * * Il faut mettre dans les dependances Maven le nuiton-profiling * <pre> @@ -79,24 +79,24 @@ $lt;/aspectj$gt; * <li>$MAVEN_REPO/org/aspectj/aspectjweaver/1.7.1/aspectjweaver-1.7.1.jar</li> * </ul> * - * <h1>Utilisation</h1> + * <h2>Utilisation</h2> * * Il y a 3 modes: interactif, non interactif et par programmation * - * <h2>Mode non interactif</h2> + * <h3>Mode non interactif</h3> * * Il faut mettre le nom d'un fichier dans la variable d'environnnement * {@link #AUTO_SAVE_FILENAME_OPTION}. Dans ce cas lors de l'arrêt de la JVM * les statistiques sont ecrites dans ce fichier. * - * <h2>Mode interactif</h2> + * <h3>Mode interactif</h3> * * Il est possible de demander a a NuitonTrace lorsqu'il s'initialise de demarrer * un serveur Web qui permet de voir et recuperer les donnees statistiques. * Pour cela il faut indique sur quel port le serveur doit attendre via la * variable d'environnnement {@link #PORT_OPTION} * - * <h2>Par programmation</h2> + * <h3>Par programmation</h3> * * Pour afficher les statistiques dans votre programme * <ul> @@ -104,7 +104,7 @@ $lt;/aspectj$gt; * <li> NuitonTrace.printStatistiqueAndClear();</li> * </ul> * - * <h1>Autre mode de fonctionnement</h1> + * <h2>Autre mode de fonctionnement</h2> * * Il doit être possible, plutot que d'écrire un fichier XML, de sous classer * NuitonTrace en ajoutant par exemple -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-profiling. See https://gitlab.nuiton.org/nuiton/nuiton-profiling.git commit e3f0d5cf200824af08137f16a6467f36ea0df93c Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jun 4 21:36:05 2020 +0200 #22: Add getter to access StatAndStack#statistics --- src/main/java/org/nuiton/profiling/Trace.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/nuiton/profiling/Trace.java b/src/main/java/org/nuiton/profiling/Trace.java index 5940b02..d59f68b 100644 --- a/src/main/java/org/nuiton/profiling/Trace.java +++ b/src/main/java/org/nuiton/profiling/Trace.java @@ -65,9 +65,11 @@ public class Trace { statistics.put(method, result); } return result; - } - + } + public Map<Method, StatisticMethod> getStatistics() { + return statistics; + } } protected boolean distinctThreadCall = false; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm