diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2006-11-20 15:07:02 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2006-11-20 15:07:02 +0000 |
| commit | 74f25dd6384b2a1f3154229c53cce16203a4bc72 (patch) | |
| tree | 3267140e841e8d3e126261e72cf5a2d453bd42b3 /java | |
| parent | aa0e730b43ede5532a238ad209d627e5b9e6abc9 (diff) | |
| download | qpid-python-74f25dd6384b2a1f3154229c53cce16203a4bc72.tar.gz | |
broker/pom.xml - removed test scope from junit to remove warning in build log.
TransportConnection.java/AMQQueue.java - change log level on a print statement from warn to info
log4j.properties - updated threashold to be 'all' so we can set the logging level with amqj.logging.level
client/pom.xml - fixed mvn test run output. It wasn't using our log4.properties file.
systests/pom.xml - added log4j.properties configuration
broker/pom.xml - added log4j.properties configuration
common/pom.xml - skipped tests as there are none, and it caused the build to fail
Also adjusted spaceing to be 4 space per tab (and no tabs)
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477214 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/pom.xml | 154 | ||||
| -rw-r--r-- | java/client/pom.xml | 200 | ||||
| -rw-r--r-- | java/client/src/main/java/log4j.properties | 2 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java | 4 | ||||
| -rw-r--r-- | java/cluster/pom.xml | 3 | ||||
| -rw-r--r-- | java/common/pom.xml | 135 | ||||
| -rw-r--r-- | java/pom.xml | 1237 | ||||
| -rw-r--r-- | java/systests/pom.xml | 149 | ||||
| -rw-r--r-- | java/systests/src/test/java/log4j.properties | 28 |
9 files changed, 967 insertions, 945 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml index 85aae51217..26071f3c20 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -18,72 +18,100 @@ --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-broker</artifactId> - <packaging>jar</packaging> - <version>1.0-incubating-M2-SNAPSHOT</version> - <name>Qpid Broker</name> - <url>http://cwiki.apache.org/confluence/display/qpid</url> - - <parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.qpid</groupId> - <artifactId>qpid</artifactId> + <artifactId>qpid-broker</artifactId> + <packaging>jar</packaging> <version>1.0-incubating-M2-SNAPSHOT</version> - </parent> + <name>Qpid Broker</name> + <url>http://cwiki.apache.org/confluence/display/qpid</url> + + <parent> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid</artifactId> + <version>1.0-incubating-M2-SNAPSHOT</version> + </parent> + + <properties> + <topDirectoryLocation>..</topDirectoryLocation> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-common</artifactId> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-filter-ssl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-java5</artifactId> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </dependency> - <properties> - <topDirectoryLocation>..</topDirectoryLocation> - </properties> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-filter-ssl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-java5</artifactId> - </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <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> - </dependency> - </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>amqj.noAutoCreateVMBroker</name> + <value>true</value> + </property> + <property> + <name>amqj.logging.level</name> + <value>WARN</value> + </property> + <property> + <name>log4j.configuration</name> + <value>file:///${basedir}/src/main/java/log4j.properties</value> + </property> + </systemProperties> + <includes> + <include>**/test/**/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/java/client/pom.xml b/java/client/pom.xml index 6965a72759..cd619a824a 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -19,109 +19,109 @@ <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - <packaging>jar</packaging> - <version>1.0-incubating-M2-SNAPSHOT</version> - <name>Qpid Client</name> - <url>http://cwiki.apache.org/confluence/display/qpid</url> - - <parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.qpid</groupId> - <artifactId>qpid</artifactId> + <artifactId>qpid-client</artifactId> + <packaging>jar</packaging> <version>1.0-incubating-M2-SNAPSHOT</version> - </parent> + <name>Qpid Client</name> + <url>http://cwiki.apache.org/confluence/display/qpid</url> + + <parent> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid</artifactId> + <version>1.0-incubating-M2-SNAPSHOT</version> + </parent> + + <properties> + <topDirectoryLocation>..</topDirectoryLocation> + <amqj.logging.level>warn</amqj.logging.level> + </properties> + + + <dependencies> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker</artifactId> + </dependency> + + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-filter-ssl</artifactId> + </dependency> + + + <dependency> + <groupId>jmscts</groupId> + <artifactId>jmscts</artifactId> + <version>0.5-b2</version> + <exclusions> + <exclusion> + <groupId>jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + </exclusions> + </dependency> - <properties> - <topDirectoryLocation>..</topDirectoryLocation> - </properties> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <scope>test</scope> + </dependency> - <dependencies> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-filter-ssl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-broker</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jmscts</groupId> - <artifactId>jmscts</artifactId> - <version>0.5-b2</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xml-security</groupId> - <artifactId>xml-security</artifactId> - <version>1.0.4</version> - <scope>test</scope> - </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>amqj.noAutoCreateVMBroker</name> - <value>true</value> - </property> - </systemProperties> - <includes> - <include>**/test/unit/**/*Test.java</include> - </includes> - <excludes> - <exclude>**/JNDIReferenceableTest.java</exclude> - <exclude>**/TransactedTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>amqj.noAutoCreateVMBroker</name> + <value>true</value> + </property> + <property> + <name>amqj.logging.level</name> + <value>WARN</value> + </property> + <property> + <name>log4j.configuration</name> + <value>file:///${basedir}/src/main/java/log4j.properties</value> + </property> + </systemProperties> + <includes> + <include>**/test/unit/**/*Test.java</include> + </includes> + <excludes> + <exclude>**/JNDIReferenceableTest.java</exclude> + <exclude>**/TransactedTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/java/client/src/main/java/log4j.properties b/java/client/src/main/java/log4j.properties index 371cfb6d61..6d596d1d19 100644 --- a/java/client/src/main/java/log4j.properties +++ b/java/client/src/main/java/log4j.properties @@ -23,6 +23,6 @@ log4j.logger.org.apache.qpid=${amqj.logging.level}, console log4j.additivity.org.apache.qpid=false log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Threshold=info +log4j.appender.console.Threshold=all log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java index ead8308143..58507a75ca 100644 --- a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java @@ -120,12 +120,12 @@ public class TransportConnection //FIXME - this needs to be sorted to use the new Mina MultiThread SA. if (Boolean.getBoolean("qpidnio")) { - _logger.warn("Using Qpid NIO - DISABLED"); + _logger.fatal("Using Qpid NIO - sysproperty 'qpidnio' is set."); // result = new org.apache.qpid.nio.SocketConnector(); // non-blocking connector } // else { - _logger.warn("Using Mina NIO"); + _logger.info("Using Mina NIO"); result = new SocketConnector(); // non-blocking connector } diff --git a/java/cluster/pom.xml b/java/cluster/pom.xml index a7c38e923b..7b198a70d3 100644 --- a/java/cluster/pom.xml +++ b/java/cluster/pom.xml @@ -51,8 +51,7 @@ </dependency> <dependency> <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <artifactId>junit</artifactId> </dependency> <dependency> <groupId>ant</groupId> diff --git a/java/common/pom.xml b/java/common/pom.xml index b69e1e1ec3..c40f773ade 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -19,72 +19,81 @@ <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - <packaging>jar</packaging> - <version>1.0-incubating-M2-SNAPSHOT</version> - <name>Qpid Common Utilities</name> - <url>http://cwiki.apache.org/confluence/display/qpid</url> - - <parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.qpid</groupId> - <artifactId>qpid</artifactId> + <artifactId>qpid-common</artifactId> + <packaging>jar</packaging> <version>1.0-incubating-M2-SNAPSHOT</version> - </parent> + <name>Qpid Common Utilities</name> + <url>http://cwiki.apache.org/confluence/display/qpid</url> + + <parent> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid</artifactId> + <version>1.0-incubating-M2-SNAPSHOT</version> + </parent> + + <properties> + <topDirectoryLocation>..</topDirectoryLocation> + <cluster.asl>${basedir}/src/main/xsl/cluster.asl</cluster.asl> + <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet> + <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet> + <registry.template>${basedir}/src/main/xsl/registry.template</registry.template> + <generated.path>${project.build.directory}/generated/xsl</generated.path> + <generated.package>org/apache/qpid/framing</generated.package> + <generated.dir>${generated.path}/${generated.package}</generated.dir> + <specs.dir>${topDirectoryLocation}/../specs</specs.dir> + </properties> - <properties> - <topDirectoryLocation>..</topDirectoryLocation> - <cluster.asl>${basedir}/src/main/xsl/cluster.asl</cluster.asl> - <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet> - <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet> - <registry.template>${basedir}/src/main/xsl/registry.template</registry.template> - <generated.path>${project.build.directory}/generated/xsl</generated.path> - <generated.package>org/apache/qpid/framing</generated.package> - <generated.dir>${generated.path}/${generated.package}</generated.dir> - <specs.dir>${topDirectoryLocation}/../specs</specs.dir> - </properties> + <build> + <plugins> + <!-- There are no common tests at the moment --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>protocol-version</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <ant antfile="protocol-version.xml"> - <property name="cluster.asl" value="${cluster.asl}"/> - <property name="spec.stylesheet" value="${spec.stylesheet}"/> - <property name="registry.stylesheet" value="${registry.stylesheet}"/> - <property name="registry.template" value="${registry.template}"/> - <property name="generated.dir" value="${generated.dir}"/> - <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/> - <property name="specs.dir" value="${specs.dir}"/> - </ant> - </tasks> - <sourceRoot>${generated.path}</sourceRoot> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>protocol-version</id> + <phase>generate-sources</phase> + <configuration> + <tasks> + <ant antfile="protocol-version.xml"> + <property name="cluster.asl" value="${cluster.asl}"/> + <property name="spec.stylesheet" value="${spec.stylesheet}"/> + <property name="registry.stylesheet" value="${registry.stylesheet}"/> + <property name="registry.template" value="${registry.template}"/> + <property name="generated.dir" value="${generated.dir}"/> + <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/> + <property name="specs.dir" value="${specs.dir}"/> + </ant> + </tasks> + <sourceRoot>${generated.path}</sourceRoot> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-core</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> + </dependency> + </dependencies> </project> diff --git a/java/pom.xml b/java/pom.xml index de44ee5c16..0afe4b3edd 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -21,668 +21,615 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid</artifactId> - <version>1.0-incubating-M2-SNAPSHOT</version> - <name>Qpid</name> - <url>http://cwiki.apache.org/confluence/display/qpid</url> - - <packaging>pom</packaging> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</connection> - <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</developerConnection> - <url>http://svn.apache.org/viewvc/incubator/qpid/trunk/</url> - </scm> - - <prerequisites> - <maven>2.0.4</maven> - </prerequisites> - - <inceptionYear>2006</inceptionYear> - <mailingLists> - <mailingList> - <name>Qpid Developer List</name> - <subscribe>qpid-dev-subscribe@incubator.apache.org</subscribe> - <unsubscribe>qpid-dev-unsubscribe@incubator.apache.org</unsubscribe> - <post>qpid-dev@incubator.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/incubator-qpid-dev</archive> - </mailingList> - <mailingList> - <name>Qpid Commits List</name> - <subscribe>qpid-commits-subscribe@incubator.apache.org</subscribe> - <unsubscribe>qpid-commits-unsubscribe@incubator.apache.org</unsubscribe> - <post>qpid-commits@incubator.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/incubator-qpid-commits</archive> - </mailingList> - </mailingLists> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <properties> - <topDirectoryLocation>.</topDirectoryLocation> - - <surefire.fork.mode>once</surefire.fork.mode> - <surefire.format>brief</surefire.format> - <surefire.usefile>false</surefire.usefile> - <compile.forked>false</compile.forked> - <java.source.version>1.5</java.source.version> - <compile.flags>-Xlint:fallthrough,finally</compile.flags> - - <!--Versions for various plugins and features --> - <antrun.version>1.2-SNAPSHOT</antrun.version> - <assembly.version>2.1</assembly.version> - <cobertura.version>2.0</cobertura.version> - <compiler.version>2.0.1</compiler.version> - <dependency.plugin.version>1.0</dependency.plugin.version> - <eclipse.plugin.version>2.2</eclipse.plugin.version> - <jar.version>2.0</jar.version> - <javadoc.version>2.0</javadoc.version> - <jxr.version>2.0</jxr.version> - <mprojectinfo.version>2.0</mprojectinfo.version> - <resources.version>2.2</resources.version> - <site.version>2.0-beta-5</site.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>broker</module> - <module>client</module> - <module>cluster</module> - <module>systests</module> - </modules> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**</include> - </includes> - </resource> - <resource> - <directory>src/main/resources-filtered</directory> - <includes> - <include>**</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>target/generated/src/main/resources</directory> - <includes> - <include>**</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**</include> - </includes> - </testResource> - <testResource> - <directory>src/test/java</directory> - <includes> - <exclude>**/*.xml</exclude> - </includes> - <filtering>true</filtering> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${antrun.version}</version> - <dependencies> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid</artifactId> + <version>1.0-incubating-M2-SNAPSHOT</version> + <name>Qpid</name> + <url>http://cwiki.apache.org/confluence/display/qpid</url> + + <packaging>pom</packaging> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</connection> + <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</developerConnection> + <url>http://svn.apache.org/viewvc/incubator/qpid/trunk/</url> + </scm> + + <prerequisites> + <maven>2.0.4</maven> + </prerequisites> + + <inceptionYear>2006</inceptionYear> + <mailingLists> + <mailingList> + <name>Qpid Developer List</name> + <subscribe>qpid-dev-subscribe@incubator.apache.org</subscribe> + <unsubscribe>qpid-dev-unsubscribe@incubator.apache.org</unsubscribe> + <post>qpid-dev@incubator.apache.org</post> + <archive>http://mail-archives.apache.org/mod_mbox/incubator-qpid-dev</archive> + </mailingList> + <mailingList> + <name>Qpid Commits List</name> + <subscribe>qpid-commits-subscribe@incubator.apache.org</subscribe> + <unsubscribe>qpid-commits-unsubscribe@incubator.apache.org</unsubscribe> + <post>qpid-commits@incubator.apache.org</post> + <archive>http://mail-archives.apache.org/mod_mbox/incubator-qpid-commits</archive> + </mailingList> + </mailingLists> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> + <properties> + <topDirectoryLocation>.</topDirectoryLocation> + + <surefire.fork.mode>once</surefire.fork.mode> + <surefire.format>brief</surefire.format> + <surefire.usefile>false</surefire.usefile> + <compile.forked>false</compile.forked> + <java.source.version>1.5</java.source.version> + <compile.flags>-Xlint:fallthrough,finally</compile.flags> + + <!--Versions for various plugins and features --> + <antrun.version>1.2-SNAPSHOT</antrun.version> + <assembly.version>2.1</assembly.version> + <cobertura.version>2.0</cobertura.version> + <compiler.version>2.0.1</compiler.version> + <dependency.plugin.version>1.0</dependency.plugin.version> + <eclipse.plugin.version>2.2</eclipse.plugin.version> + <jar.version>2.0</jar.version> + <javadoc.version>2.0</javadoc.version> + <jxr.version>2.0</jxr.version> + <mprojectinfo.version>2.0</mprojectinfo.version> + <resources.version>2.2</resources.version> + <site.version>2.0-beta-5</site.version> + <surefire-report.version>2.1-SNAPSHOT</surefire-report.version> + <surefire.version>2.3-SNAPSHOT</surefire.version> + + <amqj.logging.level>debug</amqj.logging.level> + + <eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir> + </properties> + + <modules> + <module>common</module> + <module>broker</module> + <module>client</module> + <module>cluster</module> + <module>systests</module> + </modules> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**</include> + </includes> + </resource> + <resource> + <directory>src/main/resources-filtered</directory> + <includes> + <include>**</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>target/generated/src/main/resources</directory> + <includes> + <include>**</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**</include> + </includes> + </testResource> + <testResource> + <directory>src/test/java</directory> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + <filtering>true</filtering> + </testResource> + </testResources> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${antrun.version}</version> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.6.5</version> + </dependency> + + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${jar.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${resources.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.version}</version> + <configuration> + <source>${java.source.version}</source> + <target>${java.source.version}</target> + <fork>${compile.forked}</fork> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> + <configuration> + <excludes> + <exclude>**/*$*</exclude> + </excludes> + <reportFormat>${surefire.format}</reportFormat> + <useFile>${surefire.usefile}</useFile> + <forkMode>${surefire.fork.mode}</forkMode> + <childDelegation>false</childDelegation> + <argLine>-ea</argLine> + <systemproperties> + <property> + <name>amqj.logging.level</name> + <value>${amqj.logging.level}</value> + </property> + </systemproperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>${site.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>${eclipse.plugin.version}</version> + <configuration> + <!--downloadSources>true</downloadSources--> + <buildcommands> + <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String> + <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String> + <java.lang.String>net.sourceforge.pmd.runtime.pmdBuilder</java.lang.String> + </buildcommands> + <projectnatures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + <nature>net.sourceforge.pmd.runtime.pmdNature</nature> + </projectnatures> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-idea-plugin</artifactId> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + </configuration> + </plugin> + + </plugins> + + </pluginManagement> + <defaultGoal>install</defaultGoal> + </build> + + <dependencyManagement> + <dependencies> + <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - <version>2.0.0</version> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.0</version> </dependency> + <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xbean_xpath</artifactId> - <version>2.1.0</version> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> </dependency> <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xmlpublic</artifactId> - <version>2.1.0</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> </dependency> + <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jsr173_api</artifactId> - <version>1.0</version> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>1.2</version> </dependency> + <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> + + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.1</version> </dependency> <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon</artifactId> + <version>8.7</version> + </dependency> + + <dependency> + <groupId>jython</groupId> + <artifactId>jython</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.12</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-filter-ssl</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-java5</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${jar.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${resources.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${compiler.version}</version> - <configuration> - <source>${java.source.version}</source> - <target>${java.source.version}</target> - <fork>${compile.forked}</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> - <configuration> - <excludes> - <exclude>**/*$*</exclude> - </excludes> - <reportFormat>${surefire.format}</reportFormat> - <useFile>${surefire.usefile}</useFile> - <forkMode>${surefire.fork.mode}</forkMode> - <childDelegation>false</childDelegation> - <argLine>-ea</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>${site.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>${eclipse.plugin.version}</version> - <configuration> - <!--downloadSources>true</downloadSources--> - <buildcommands> - <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String> - <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String> - <java.lang.String>net.sourceforge.pmd.runtime.pmdBuilder</java.lang.String> - </buildcommands> - <projectnatures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> - <nature>net.sourceforge.pmd.runtime.pmdNature</nature> - </projectnatures> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <defaultGoal>install</defaultGoal> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>commons-attributes</groupId> - <artifactId>commons-attributes-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-attributes</groupId> - <artifactId>commons-attributes-compiler</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jsr173_api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>saxon</artifactId> - <version>8.7</version> - </dependency> - <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xbean_xpath</artifactId> - <version>2.1.0</version> - </dependency> - <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xmlpublic</artifactId> - <version>2.1.0</version> - </dependency> - <dependency> - <groupId>jython</groupId> - <artifactId>jython</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-filter-ssl</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.mina</groupId> - <artifactId>mina-java5</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</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> - <artifactId>qpid-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-broker</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-mgmt-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-mgmt-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-cluster</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>${cobertura.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${mprojectinfo.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire-report.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>${basedir}/${topDirectoryLocation}/checkstyle.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${java.source.version}</targetJdk> - <rulesets> - <ruleset>${basedir}/.ruleset</ruleset> - </rulesets> - </configuration> - </plugin> - </plugins> - </reporting> - - <repositories> - <!-- not picking up any snapshots at the moment - <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> - <id>fastinstall</id> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> - <profile> - <id>nochecks</id> - </profile> - - <profile> - <!-- default profile enables checkstyle and Xlint stuff --> - <id>sourcecheck</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>false</showDeprecation> - <compilerArgument>${compile.flags}</compilerArgument> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>setup.eclipse</id> - <build> - <defaultGoal>process-test-sources</defaultGoal> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-mgmt-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-mgmt-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-cluster</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <reporting> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <executions> - <execution> - <id>setup.eclipse.project</id> - <phase>process-test-sources</phase> - <goals> - <goal>eclipse</goal> - </goals> - </execution> - <execution> - <id>setup.eclipse.workspace</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-maven-repo</goal> - </goals> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>${cobertura.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${mprojectinfo.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${surefire-report.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <workspace>${eclipse.workspace.dir}</workspace> + <configLocation>${basedir}/${topDirectoryLocation}/checkstyle.xml</configLocation> </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${antrun.version}</version> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>setup.workspace</id> - <phase>validate</phase> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> <configuration> - <tasks> - <path id="ecp.ws.path" location="${eclipse.workspace.dir}"/> - <property name="full.eclipse.workspace" refid="ecp.ws.path"/> - - <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"/> - <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle"/> - <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"/> - <copy file="${basedir}/${topDirectoryLocation}/checkstyle.xml" tofile="${full.eclipse.workspace}/qpid-checkstyle.xml"/> - <copy file="${basedir}/${topDirectoryLocation}/etc/apache-header.txt" tofile="${full.eclipse.workspace}/apache-header.txt"/> - - <!-- Add checkstyle config --> - <copy file="${basedir}/${topDirectoryLocation}/etc/eclipse/template.checkstyle-config.xml" - tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" - overwrite="no"> - <filterset> - <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/qpid-checkstyle.xml"/> - <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt"/> - </filterset> - </copy> - - <xslt style="${basedir}/${topDirectoryLocation}/etc/eclipse/addcheckstyle.xsl" - in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" - out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"> - <param name="checkstyleconfig" expression="${full.eclipse.workspace}/qpid-checkstyle.xml"/> - </xslt> - <copy - file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" - tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" - overwrite="yes"/> - - - <!-- Add warning flags that we want --> - <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"> - <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion" value="ignore"/> - <entry key="org.eclipse.jdt.core.compiler.problem.unusedImport" value="ignore"/> - <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface" value="ignore"/> - </propertyfile> - - - <!-- Add code format rules --> - <concat destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" - append="true" fixlastline="true"> - <filelist dir="${basedir}/${topDirectoryLocation}/etc/eclipse" files="org.eclipse.jdt.core.prefs"/> - </concat> - <loadfile property="eclipse.code.format" srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/QpidCodeFormatter.xml"/> - <loadfile property="eclipse.code.templates" srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/codetemplates.xml"/> - <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"> - <entry key="formatter_profile" value="_Qpid Java Conventions"/> - <entry key="org.eclipse.jdt.ui.formatterprofiles" value="${eclipse.code.format}"/> - <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}"/> - - <!-- Add import order --> - <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;junit;com;org;"/> - <!-- Sort order --> - <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"/> - <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M,"/> - <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true"/> - </propertyfile> - </tasks> + <targetJdk>${java.source.version}</targetJdk> + <rulesets> + <ruleset>${basedir}/.ruleset</ruleset> + </rulesets> </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + </plugin> </plugins> - </build> - </profile> - </profiles> + </reporting> + + <repositories> + <!-- not picking up any snapshots at the moment + <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> + <id>fastinstall</id> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> + <profile> + <id>nochecks</id> + </profile> + + <profile> + <!-- default profile enables checkstyle and Xlint stuff --> + <id>sourcecheck</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>false</showDeprecation> + <compilerArgument>${compile.flags}</compilerArgument> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>setup.eclipse</id> + <build> + <defaultGoal>process-test-sources</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <executions> + <execution> + <id>setup.eclipse.project</id> + <phase>process-test-sources</phase> + <goals> + <goal>eclipse</goal> + </goals> + </execution> + <execution> + <id>setup.eclipse.workspace</id> + <phase>process-test-sources</phase> + <goals> + <goal>add-maven-repo</goal> + </goals> + <configuration> + <workspace>${eclipse.workspace.dir}</workspace> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${antrun.version}</version> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>setup.workspace</id> + <phase>validate</phase> + <configuration> + <tasks> + <path id="ecp.ws.path" location="${eclipse.workspace.dir}"/> + <property name="full.eclipse.workspace" refid="ecp.ws.path"/> + + <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"/> + <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle"/> + <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"/> + <copy file="${basedir}/${topDirectoryLocation}/checkstyle.xml" + tofile="${full.eclipse.workspace}/qpid-checkstyle.xml"/> + <copy file="${basedir}/${topDirectoryLocation}/etc/apache-header.txt" + tofile="${full.eclipse.workspace}/apache-header.txt"/> + + <!-- Add checkstyle config --> + <copy file="${basedir}/${topDirectoryLocation}/etc/eclipse/template.checkstyle-config.xml" + tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" + overwrite="no"> + <filterset> + <filter token="CHECKSTYLE_CONFIG_FILE" + value="${full.eclipse.workspace}/qpid-checkstyle.xml"/> + <filter token="APACHE_HEADER_FILE" + value="${full.eclipse.workspace}/apache-header.txt"/> + </filterset> + </copy> + + <xslt style="${basedir}/${topDirectoryLocation}/etc/eclipse/addcheckstyle.xsl" + in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" + out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"> + <param name="checkstyleconfig" + expression="${full.eclipse.workspace}/qpid-checkstyle.xml"/> + </xslt> + <copy + file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" + tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" + overwrite="yes"/> + + + <!-- Add warning flags that we want --> + <propertyfile + file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"> + <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion" + value="ignore"/> + <entry key="org.eclipse.jdt.core.compiler.problem.unusedImport" + value="ignore"/> + <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface" + value="ignore"/> + </propertyfile> + + + <!-- Add code format rules --> + <concat destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs" + append="true" fixlastline="true"> + <filelist dir="${basedir}/${topDirectoryLocation}/etc/eclipse" + files="org.eclipse.jdt.core.prefs"/> + </concat> + <loadfile property="eclipse.code.format" + srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/QpidCodeFormatter.xml"/> + <loadfile property="eclipse.code.templates" + srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/codetemplates.xml"/> + <propertyfile + file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"> + <entry key="formatter_profile" value="_Qpid Java Conventions"/> + <entry key="org.eclipse.jdt.ui.formatterprofiles" + value="${eclipse.code.format}"/> + <entry key="org.eclipse.jdt.ui.text.custom_code_templates" + value="${eclipse.code.templates}"/> + + <!-- Add import order --> + <entry key="org.eclipse.jdt.ui.importorder" + value="java;javax;org.w3c;org.xml;junit;com;org;"/> + <!-- Sort order --> + <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"/> + <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M,"/> + <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true"/> + </propertyfile> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/java/systests/pom.xml b/java/systests/pom.xml index 3df69ce4ac..ae6558340f 100644 --- a/java/systests/pom.xml +++ b/java/systests/pom.xml @@ -18,78 +18,89 @@ --> <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-systests</artifactId> - <packaging>jar</packaging> - <version>1.0-incubating-M2-SNAPSHOT</version> - <name>Qpid System Tests</name> - <url>http://cwiki.apache.org/confluence/display/qpid</url> - - <parent> + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.qpid</groupId> - <artifactId>qpid</artifactId> + <artifactId>qpid-systests</artifactId> + <packaging>jar</packaging> <version>1.0-incubating-M2-SNAPSHOT</version> - </parent> + <name>Qpid System Tests</name> + <url>http://cwiki.apache.org/confluence/display/qpid</url> + + <parent> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid</artifactId> + <version>1.0-incubating-M2-SNAPSHOT</version> + </parent> - <properties> - <topDirectoryLocation>..</topDirectoryLocation> - </properties> + <properties> + <topDirectoryLocation>..</topDirectoryLocation> + <amqj.logging.level>warn</amqj.logging.level> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-broker</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>amqj.noAutoCreateVMBroker</name> - <value>true</value> - </property> - </systemProperties> - <includes> - <include>**/server/**/*Test.java</include> - <include>**/test/unit/ack/DisconnectAndRedeliver.java</include> - </includes> - <excludes> - <exclude>**/Abstract*Test*</exclude> - <exclude>**/*PerfTest*</exclude> - <exclude>**/*PerformanceTest*</exclude> - <exclude>**/server/util/ConcurrentTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>amqj.noAutoCreateVMBroker</name> + <value>true</value> + </property> + <property> + <name>amqj.logging.level</name> + <value>${amqj.logging.level}</value> + </property> + <property> + <name>log4j.debug</name> + <value>true</value> + </property> + <property> + <name>log4j.configuration</name> + <value>file:///${basedir}/src/test/java/log4j.properties</value> + </property> + </systemProperties> + <includes> + <include>**/server/**/*Test.java</include> + <include>**/test/unit/ack/DisconnectAndRedeliver.java</include> + </includes> + <excludes> + <exclude>**/Abstract*Test*</exclude> + <exclude>**/*PerfTest*</exclude> + <exclude>**/*PerformanceTest*</exclude> + <exclude>**/server/util/ConcurrentTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/java/systests/src/test/java/log4j.properties b/java/systests/src/test/java/log4j.properties new file mode 100644 index 0000000000..6d596d1d19 --- /dev/null +++ b/java/systests/src/test/java/log4j.properties @@ -0,0 +1,28 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +log4j.rootLogger=${root.logging.level} + + +log4j.logger.org.apache.qpid=${amqj.logging.level}, console +log4j.additivity.org.apache.qpid=false + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.Threshold=all +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n |