Author: veithen
Date: Sat Mar 7 21:06:26 2009
New Revision: 751329
URL: http://svn.apache.org/viewvc?rev=751329&view=rev
Log:
* Restored AspectJ message interception in JMS tests.
* Fixed log4j configuration in HTTP, JMS and mail tests.
Added:
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
(contents, props changed)
- copied, changed from r750173,
webservices/commons/trunk/modules/transport/modules/tests/src/test/resources/META-INF/aop.xml
Modified:
webservices/commons/trunk/modules/transport/modules/http/pom.xml
webservices/commons/trunk/modules/transport/modules/jms/pom.xml
webservices/commons/trunk/modules/transport/modules/mail/pom.xml
Modified: webservices/commons/trunk/modules/transport/modules/http/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/pom.xml?rev=751329&r1=751328&r2=751329&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/http/pom.xml Sat Mar 7
21:06:26 2009
@@ -45,7 +45,7 @@
<systemProperties>
<property>
<name>log4j.configuration</name>
- <value>file:log4j.properties</value>
+ <value>file:../../log4j.properties</value>
</property>
</systemProperties>
</configuration>
Modified: webservices/commons/trunk/modules/transport/modules/jms/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/pom.xml?rev=751329&r1=751328&r2=751329&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/pom.xml Sat Mar 7
21:06:26 2009
@@ -40,15 +40,40 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+
<outputDirectory>target/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
<systemProperties>
<property>
<name>log4j.configuration</name>
- <value>file:log4j.properties</value>
+ <value>file:../../log4j.properties</value>
</property>
</systemProperties>
+ <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m
-Xmx128m</argLine>
</configuration>
</plugin>
<plugin>
Copied:
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
(from r750173,
webservices/commons/trunk/modules/transport/modules/tests/src/test/resources/META-INF/aop.xml)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml?p2=webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml&p1=webservices/commons/trunk/modules/transport/modules/tests/src/test/resources/META-INF/aop.xml&r1=750173&r2=751329&rev=751329&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/tests/src/test/resources/META-INF/aop.xml
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
Sat Mar 7 21:06:26 2009
@@ -20,7 +20,6 @@
<aspectj>
<aspects>
<aspect name="org.apache.axis2.transport.jms.LogAspect"/>
- <aspect name="org.apache.axis2.transport.mail.LogAspect"/>
</aspects>
<weaver options="-showWeaveInfo">
<include within="org.apache.axis2.transport..*"/>
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/transport/modules/jms/src/test/resources/META-INF/aop.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/commons/trunk/modules/transport/modules/mail/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/pom.xml?rev=751329&r1=751328&r2=751329&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Sat Mar 7
21:06:26 2009
@@ -93,7 +93,7 @@
<systemProperties>
<property>
<name>log4j.configuration</name>
- <value>file:log4j.properties</value>
+ <value>file:../../log4j.properties</value>
</property>
<property>
<name>net.sourceforge.cobertura.datafile</name>
