Author: tchemit Date: 2013-10-15 17:13:18 +0200 (Tue, 15 Oct 2013) New Revision: 1307 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1307 Log: refs #2865: [TECH] Am?\195?\169liorer les temps d'?\195?\169xecution (add profilng support) Added: trunk/tutti-ui-swing/src/main/profiling/ trunk/tutti-ui-swing/src/main/profiling/META-INF/ trunk/tutti-ui-swing/src/main/profiling/META-INF/aop.xml Removed: trunk/tutti-ui-swing/src/main/resources/META-INF/aop.xml Modified: trunk/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-15 09:24:23 UTC (rev 1306) +++ trunk/pom.xml 2013-10-15 15:13:18 UTC (rev 1307) @@ -209,6 +209,12 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-profiling</artifactId> + <version>2.7</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-10-15 09:24:23 UTC (rev 1306) +++ trunk/tutti-ui-swing/pom.xml 2013-10-15 15:13:18 UTC (rev 1307) @@ -722,5 +722,29 @@ </plugins> </build> </profile> + + <profile> + <id>profiling</id> + + <build> + <resources> + <resource> + <directory>src/main/profiling</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </build> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-profiling</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> Copied: trunk/tutti-ui-swing/src/main/profiling/META-INF/aop.xml (from rev 1280, trunk/tutti-ui-swing/src/main/resources/META-INF/aop.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/profiling/META-INF/aop.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/profiling/META-INF/aop.xml 2013-10-15 15:13:18 UTC (rev 1307) @@ -0,0 +1,41 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE aspectj PUBLIC + "-//AspectJ//DTD//EN" + "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> +<aspectj> + <weaver options="-verbose"/> + <aspects> + <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" + extends="org.nuiton.profiling.NuitonTrace"> + <pointcut name="executeMethod" + expression=" + execution(* fr.ifremer.tutti..*(..)) + ||execution(* fr.ifremer.adagio.core..*(..)) + ||execution(* org.springframework..*(..)) + ||execution(* org.hibernate..*(..)) + "/> + </concrete-aspect> + </aspects> +</aspectj> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/resources/META-INF/aop.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/META-INF/aop.xml 2013-10-15 09:24:23 UTC (rev 1306) +++ trunk/tutti-ui-swing/src/main/resources/META-INF/aop.xml 2013-10-15 15:13:18 UTC (rev 1307) @@ -1,41 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU 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 Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE aspectj PUBLIC - "-//AspectJ//DTD//EN" - "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> -<aspectj> - <weaver options="-verbose"/> - <aspects> - <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" - extends="org.nuiton.profiling.NuitonTrace"> - <pointcut name="executeMethod" - expression=" - execution(* fr.ifremer.tutti.ui.swing.util..*(..)) - ||execution(* fr.ifremer.tutti.ui.swing.content..*(..)) - ||execution(* org.nuiton.decorator..*(..)) - ||execution(* jaxx.runtime.swing.editor.bean.BeanComboBox.*(..)) - "/> - </concrete-aspect> - </aspects> -</aspectj> \ No newline at end of file