Author: tchemit Date: 2011-08-24 17:53:53 +0200 (Wed, 24 Aug 2011) New Revision: 2185 Url: http://nuiton.org/repositories/revision/nuiton-utils/2185 Log: optimize poms + clean aop.xml + remove verbose in tests Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-08-24 15:39:42 UTC (rev 2184) +++ trunk/nuiton-profiling/pom.xml 2011-08-24 15:53:53 UTC (rev 2185) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -50,50 +52,19 @@ <artifactId>commons-lang</artifactId> </dependency> - <!-- aspectJ --> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>${aspectj.version}</version> - <scope>runtime</scope> - </dependency> - - - <!-- aspectwerkz use asm* dependencies which are not on central... --> - <!-- Event if we relocated them to a org.nuiton.thirdparty groupId --> -<!-- - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-core</artifactId> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-jdk5</artifactId> - <scope>compile</scope> - </dependency> ---> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -124,12 +95,12 @@ <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <aspectj.version>1.6.11</aspectj.version> <!-- Configure aop --> - <maven.surefire.debug>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-1.6.11.jar</maven.surefire.debug> - <!--maven.surefire.debug>-javaagent:target/lib/aspectwerkz-jdk5-2.0.jar</maven.surefire.debug--> - <!--<maven.surefire.debug>-javaagent:target/lib/aspectwerkz-jdk5-2.0.jar -Daspectwerkz.definition.file=src/test/resources/aop.xml</maven.surefire.debug>--> + <maven.surefire.debug> + -javaagent:target/lib/aspectjweaver-${aspectj.version}.jar + </maven.surefire.debug> + <!--<maven.surefire.debug>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-1.6.11.jar</maven.surefire.debug>--> </properties> <!-- ************************************************************* --> Modified: trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java =================================================================== --- trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java 2011-08-24 15:39:42 UTC (rev 2184) +++ trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java 2011-08-24 15:53:53 UTC (rev 2185) @@ -31,7 +31,7 @@ import org.junit.Test; /** - * Launch this test with -javaagent:target/lib/aspectwerkz-jdk5-2.0.jar + * Launch this test with -javaagent:target/lib/aspectjweaver-1.6.11.jar * * @author tchemit <chemit@codelutin.com> * @since 2.3 Modified: trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml =================================================================== --- trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml 2011-08-24 15:39:42 UTC (rev 2184) +++ trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml 2011-08-24 15:53:53 UTC (rev 2185) @@ -3,18 +3,19 @@ "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> <aspectj> - <aspects> - <!-- creation d'un aspect pour definir les methodes a intercepter --> - <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" - extends="org.nuiton.profiling.NuitonTrace"> - <pointcut name="executeMethod" expression="execution(public * org.apache..*.*(..)) AND !within(org.apache.log4j..*) AND !within(org.apache.maven..*) AND !within(org.apache.commons.lang..*)"/> + <!-- quelques options pour voir ce qu'il se passe (non obligatoire) --> + <weaver> + <!--<weaver options="-verbose -showWeaveInfo ">--> + <!-- quelque restriction sur les classes a prendre en compte, pour avec un exemple --> + <include within="org.apache.commons.logging..*" /> + <!-- la config pour que aspectj ecrive sur le disque les fichiers java qu'il genere --> + <!-- <dump within="*"/> --> + </weaver> + <aspects> + <!-- creation d'un aspect pour definir les methodes a intercepter --> + <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" + extends="org.nuiton.profiling.NuitonTrace"> + <pointcut name="executeMethod" expression="execution(public * org.apache..*.*(..)) AND !within(org.apache.log4j..*)"/> </concrete-aspect> </aspects> - <!-- quelques options pour voir ce qu'il se passe (non obligatoire) --> - <weaver options="-verbose -showWeaveInfo "> - <!-- quelque restriction sur les classes a prendre en compte, pour avec un exemple --> - <include within="org.apache.commons.logging.*" /> - <!-- la config pour que aspectj ecrive sur le disque les fichiers java qu'il genere --> - <!-- <dump within="*"/> --> - </weaver> </aspectj>