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/common/pom.xml | 135 ++++++++++++++++++++++++++++------------------------
 1 file changed, 72 insertions(+), 63 deletions(-)

(limited to 'java/common')

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