From 74f25dd6384b2a1f3154229c53cce16203a4bc72 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Mon, 20 Nov 2006 15:07:02 +0000
Subject: 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
---
 java/broker/pom.xml | 154 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 91 insertions(+), 63 deletions(-)

(limited to 'java/broker')

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>
-- 
cgit v1.2.1