Author: vinoski
Date: Sat Nov 4 18:41:03 2006
New Revision: 471340
URL: http://svn.apache.org/viewvc?view=rev&rev=471340
Log:
more maven directory restructuring
Added:
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/ack/
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
- copied unchanged from r469378,
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/exchange/
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/store/UnitTests.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/UnitTests.java
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/util/
incubator/qpid/branches/maven/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
- copied unchanged from r469355,
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
Removed:
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/store/UnitTests.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
Modified:
incubator/qpid/branches/maven/broker/pom.xml
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/UnitTests.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/UnitTests.java
incubator/qpid/branches/maven/client/pom.xml
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/UnitTests.java
incubator/qpid/branches/maven/common/pom.xml
incubator/qpid/branches/maven/pom.xml
Modified: incubator/qpid/branches/maven/broker/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/pom.xml?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
--- incubator/qpid/branches/maven/broker/pom.xml (original)
+++ incubator/qpid/branches/maven/broker/pom.xml Sat Nov 4 18:41:03 2006
@@ -67,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
@@ -77,11 +82,40 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ant-test</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="junit"
+
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+ <classpath>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </taskdef>
+ <mkdir dir="${project.build.directory}/test-classes"/>
+ <junit fork="yes" showoutput="true" haltonfailure="yes">
+ <test name="org.apache.qpid.server.UnitTests"/>
+ <formatter type="plain"/>
+ <classpath>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <includes>
- <include>**/server/UnitTests.java</include>
- </includes>
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
Modified:
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/UnitTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/UnitTests.java?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
---
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/UnitTests.java
(original)
+++
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/UnitTests.java
Sat Nov 4 18:41:03 2006
@@ -27,7 +27,6 @@
org.apache.qpid.server.exchange.UnitTests.class,
org.apache.qpid.server.protocol.UnitTests.class,
org.apache.qpid.server.queue.UnitTests.class,
- org.apache.qpid.server.store.UnitTests.class,
org.apache.qpid.server.util.UnitTests.class
})
public class UnitTests
Modified:
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
---
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
(original)
+++
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/exchange/UnitTests.java
Sat Nov 4 18:41:03 2006
@@ -22,7 +22,7 @@
import org.junit.runners.Suite;
@RunWith(Suite.class)
[EMAIL PROTECTED]({HeadersBindingTest.class, HeadersExchangeTest.class})
[EMAIL PROTECTED]({HeadersBindingTest.class})
public class UnitTests
{
public static junit.framework.Test suite()
Modified:
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/UnitTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/UnitTests.java?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
---
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/UnitTests.java
(original)
+++
incubator/qpid/branches/maven/broker/src/test/java/org/apache/qpid/server/queue/UnitTests.java
Sat Nov 4 18:41:03 2006
@@ -22,13 +22,7 @@
import org.junit.runners.Suite;
@RunWith(Suite.class)
[EMAIL PROTECTED]({
- AckTest.class,
- DeliveryManagerTest.class,
- SubscriptionManagerTest.class,
- SubscriptionSetTest.class,
- ConcurrencyTest.class}
-)
[EMAIL PROTECTED]({SubscriptionManagerTest.class, SubscriptionSetTest.class})
public class UnitTests
{
public static junit.framework.Test suite()
Modified: incubator/qpid/branches/maven/client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/client/pom.xml?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
--- incubator/qpid/branches/maven/client/pom.xml (original)
+++ incubator/qpid/branches/maven/client/pom.xml Sat Nov 4 18:41:03 2006
@@ -69,7 +69,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/RecoverTest.java?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
---
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
(original)
+++
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
Sat Nov 4 18:41:03 2006
@@ -38,8 +38,7 @@
static
{
- //DOMConfigurator.configure("../etc/log4j.xml");
- DOMConfigurator.configure("broker/etc/log4j.xml");
+ DOMConfigurator.configure("../broker/etc/log4j.xml");
}
@After
Modified:
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/UnitTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/UnitTests.java?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
---
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/UnitTests.java
(original)
+++
incubator/qpid/branches/maven/client/src/test/java/org/apache/qpid/ack/UnitTests.java
Sat Nov 4 18:41:03 2006
@@ -22,7 +22,7 @@
import org.junit.runners.Suite;
@RunWith(Suite.class)
[EMAIL PROTECTED]({DisconnectAndRedeliverTest.class, RecoverTest.class})
[EMAIL PROTECTED]({RecoverTest.class})
public class UnitTests
{
public static junit.framework.Test suite()
Modified: incubator/qpid/branches/maven/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/common/pom.xml?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
--- incubator/qpid/branches/maven/common/pom.xml (original)
+++ incubator/qpid/branches/maven/common/pom.xml Sat Nov 4 18:41:03 2006
@@ -78,9 +78,9 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/qpid/branches/maven/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/maven/pom.xml?view=diff&rev=471340&r1=471339&r2=471340
==============================================================================
--- incubator/qpid/branches/maven/pom.xml (original)
+++ incubator/qpid/branches/maven/pom.xml Sat Nov 4 18:41:03 2006
@@ -91,16 +91,16 @@
<mprojectinfo.version>2.0</mprojectinfo.version>
<resources.version>2.2</resources.version>
<site.version>2.0-beta-5</site.version>
- <surefire-report.version>2.0</surefire-report.version>
- <surefire.version>2.1.3</surefire.version>
+ <surefire-report.version>2.1-SNAPSHOT</surefire-report.version>
+ <surefire.version>2.3-SNAPSHOT</surefire.version>
<eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir>
</properties>
<modules>
<module>common</module>
- <module>client</module>
<module>broker</module>
+ <module>client</module>
<module>management</module>
<module>cluster</module>
</modules>
@@ -218,11 +218,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- <!-- do not exclude **/Abstract*Test.java
**/Abstract*TestCase.java -->
<excludes>
<exclude>**/*$*</exclude>
</excludes>
@@ -231,12 +226,6 @@
<forkMode>${surefire.fork.mode}</forkMode>
<childDelegation>false</childDelegation>
<argLine>-ea</argLine>
- <systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
-
<value>${basedir}/target/test-classes/logging.properties</value>
- </property>
- </systemProperties>
</configuration>
</plugin>
<plugin>
@@ -423,11 +412,19 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>2.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -528,15 +525,26 @@
<url>https://maven-repository.dev.java.net/nonav/repository/</url>
<layout>legacy</layout>
</repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<profiles>
<profile>
