You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2007/07/05 12:16:29 UTC
svn commit: r553445 - in /incubator/servicemix/trunk: ./
archetypes/servicemix-archetypes-itests/ common/servicemix-beanflow/
common/servicemix-common/ common/servicemix-components/
common/servicemix-soap/ common/servicemix-soap2/ core/servicemix-core/...
Author: aco
Date: Thu Jul 5 03:16:27 2007
New Revision: 553445
URL: http://svn.apache.org/viewvc?view=rev&rev=553445
Log:
- Centralized the configuration of the surefire plugin in the root pom
- Added a standard include and exclude (i.e. include - **/*Test.*, exclude - Abstract*.*)
Modified:
incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/pom.xml
incubator/servicemix/trunk/common/servicemix-beanflow/pom.xml
incubator/servicemix/trunk/common/servicemix-common/pom.xml
incubator/servicemix/trunk/common/servicemix-components/pom.xml
incubator/servicemix/trunk/common/servicemix-soap/pom.xml
incubator/servicemix/trunk/common/servicemix-soap2/pom.xml
incubator/servicemix/trunk/core/servicemix-core/pom.xml
incubator/servicemix/trunk/core/servicemix-services/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/pom.xml
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-itests/pom.xml
Modified: incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/pom.xml Thu Jul 5 03:16:27 2007
@@ -158,16 +158,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <forkMode>always</forkMode>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
<exclude>**/BindingComponent*</exclude>
<exclude>**/Jsr181*</exclude>
<exclude>**/ServiceEngine*</exclude>
<exclude>**/EmbeddedSimple*</exclude>
- </excludes>
- <forkMode>always</forkMode>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: incubator/servicemix/trunk/common/servicemix-beanflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-beanflow/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-beanflow/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-beanflow/pom.xml Thu Jul 5 03:16:27 2007
@@ -57,12 +57,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!--
- <version>2.3-SNAPSHOT</version>
- -->
<configuration>
<forkMode>pertest</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+ </excludes>
</configuration>
</plugin>
Modified: incubator/servicemix/trunk/common/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-common/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-common/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-common/pom.xml Thu Jul 5 03:16:27 2007
@@ -85,7 +85,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/TransactionsTest.*</exclude>
</excludes>
</configuration>
Modified: incubator/servicemix/trunk/common/servicemix-components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-components/pom.xml Thu Jul 5 03:16:27 2007
@@ -263,8 +263,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
<!-- exclude abstract tests -->
@@ -303,8 +304,6 @@
<exclude>**/GroovyTransformTest.*</exclude>
<exclude>**/TransformComponentTest.*</exclude>
-
-
<!-- Hangs -->
<exclude>**/SaajSoapActionTest.*</exclude>
Modified: incubator/servicemix/trunk/common/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-soap/pom.xml Thu Jul 5 03:16:27 2007
@@ -90,7 +90,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
<exclude>**/WSSecurityHandlerTest.*</exclude>
</excludes>
</configuration>
Modified: incubator/servicemix/trunk/common/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap2/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap2/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-soap2/pom.xml Thu Jul 5 03:16:27 2007
@@ -109,7 +109,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/servicemix/trunk/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/core/servicemix-core/pom.xml Thu Jul 5 03:16:27 2007
@@ -330,8 +330,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
<!-- exclude abstract tests -->
Modified: incubator/servicemix/trunk/core/servicemix-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-services/pom.xml (original)
+++ incubator/servicemix/trunk/core/servicemix-services/pom.xml Thu Jul 5 03:16:27 2007
@@ -83,6 +83,11 @@
<version>${spring-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/pom.xml Thu Jul 5 03:16:27 2007
@@ -84,11 +84,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
- <exclude>**/PollDirectoryTest*</exclude>
+ <exclude>**/PollDirectoryTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/pom.xml Thu Jul 5 03:16:27 2007
@@ -86,6 +86,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
<!-- TODO - need an embedded FTP server to be able to properly test -->
<exclude>**/*Test.*</exclude>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/pom.xml Thu Jul 5 03:16:27 2007
@@ -61,20 +61,17 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <useFile>true</useFile>
- <forkMode>once</forkMode>
- <childDelegation>false</childDelegation>
- <workingDir>${basedir}</workingDir>
- <systemProperties>
- <property>
- <name>log4j.configuration</name>
- <value>${basedir}/target/test-classes/log4j-tests.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/HttpAddressingTest.*</exclude>
- <exclude>**/HttpTxTest.*</exclude>
- <exclude>**/HttpSecurityTest.*</exclude>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
+ <exclude>**/HttpAddressingTest.*</exclude>
+ <exclude>**/HttpTxTest.*</exclude>
+ <exclude>**/HttpSecurityTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/pom.xml Thu Jul 5 03:16:27 2007
@@ -186,20 +186,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <useFile>true</useFile>
- <forkMode>once</forkMode>
- <childDelegation>false</childDelegation>
<workingDirectory>${basedir}</workingDirectory>
- <systemProperties>
- <property>
- <name>log4j.configuration</name>
- <value>log4j-tests.properties</value>
- </property>
- </systemProperties>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
+ <!-- exclude abstract test classes -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/JmsSpringJcaTest.*</exclude>
</excludes>
</configuration>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml Thu Jul 5 03:16:27 2007
@@ -86,23 +86,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/PollDirectoryTest*</exclude>
</excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- best lock down version of the plugin too -->
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
</configuration>
</plugin>
</plugins>
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/pom.xml Thu Jul 5 03:16:27 2007
@@ -92,7 +92,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<!-- These integration tests require a Jabber server -->
<exclude>**/DynamicEndpointTest.*</exclude>
<exclude>**/SpringComponentTest.*</exclude>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/pom.xml Thu Jul 5 03:16:27 2007
@@ -96,6 +96,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -106,7 +107,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<!-- TODO -->
<exclude>**/AnnotatedBeanEndpointTest.*</exclude>
<exclude>**/ConsumerBeanTest.*</exclude>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/pom.xml Thu Jul 5 03:16:27 2007
@@ -158,15 +158,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
<includes>
- <include>**/*Test*</include>
+ <include>**/*Test.*</include>
</includes>
<excludes>
<!-- exclude abstract tests -->
<exclude>**/Abstract*.*</exclude>
<exclude>**/FileSystemJarInputStreamTest.*</exclude>
- <exclude>**/BPEDeployerTest.*</exclude>
+ <exclude>**/BPEDeployerTest.*</exclude>
</excludes>
</configuration>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml Thu Jul 5 03:16:27 2007
@@ -128,7 +128,21 @@
</execution>
</executions>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/pom.xml Thu Jul 5 03:16:27 2007
@@ -110,7 +110,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/StaticRoutingSlipTxTest.*</exclude>
<exclude>**/WireTapJmsFlowTest.*</exclude>
<exclude>**/PipelineTxTest.*</exclude>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/pom.xml Thu Jul 5 03:16:27 2007
@@ -170,6 +170,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -180,7 +181,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/Jsr181SpringTest.*</exclude>
<exclude>**/Jsr181SpringProxyTest.*</exclude>
<exclude>**/Jsr181ProxySUTest.*</exclude>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/pom.xml Thu Jul 5 03:16:27 2007
@@ -137,13 +137,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>never</forkMode>
- <systemProperties>
- <property>
- <name>log4j.configuration</name>
- <value>${basedir}/target/test-classes/log4j-tests.properties</value>
- </property>
- </systemProperties>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Thu Jul 5 03:16:27 2007
@@ -430,15 +430,6 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<dependencyManagement>
<dependencies>
@@ -1716,11 +1707,12 @@
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
<argLine>-Xmx512M</argLine>
- <workingDir>${basedir}</workingDir>
+ <!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
+ <workingDirectory>${basedir}</workingDirectory>
<systemProperties>
<property>
<name>log4j.configuration</name>
- <value>${basedir}/target/test-classes/log4j-tests.properties</value>
+ <value>log4j-tests.properties</value>
</property>
</systemProperties>
</configuration>
Modified: incubator/servicemix/trunk/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-itests/pom.xml?view=diff&rev=553445&r1=553444&r2=553445
==============================================================================
--- incubator/servicemix/trunk/servicemix-itests/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-itests/pom.xml Thu Jul 5 03:16:27 2007
@@ -105,7 +105,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <workingDirectory>${basedir}</workingDirectory>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
+ <!-- exclude abstract test cases -->
+ <exclude>**/Abstract*.*</exclude>
+
<exclude>**/DeadlockTest.*</exclude>
<exclude>**/WSNComponentTest.*</exclude>
<exclude>**/Jsr181HttpTest.*</exclude>
@@ -115,29 +122,29 @@
</excludes>
</configuration>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${servicemix-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>${servicemix-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>3.2-incubating-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
+ <version>3.2-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>