Changes to POMs.

Client pom now builds a single jar with all dependancies included in the single bundle.
systests/pom.xml adjusted to include only *Test.class items. This will fix the current Error on OptOutTestCase
management/eclipse-plugin/pom.xml - editied to include there required MANIFEST.MF to identify plugin to eclipse
distribution/src/main/assembly/management-eclipse-plugin.xml editied to include there required MANIFEST.MF to identify the plugin
distribution/pom.xml - white space

Also updated log4j.xml default to create an alert.log file from the AMQQueue alerting. Added a debug.log4j.xml that gives example of debugging the broker via log4j.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@561278 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 209 insertions, 31 deletions

diff --git a/java/broker/etc/debug.log4j.xml b/java/broker/etc/debug.log4j.xml
new file mode 100644
index 0000000000..e8fd7e119d
--- /dev/null
+++ b/java/broker/etc/debug.log4j.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+    <appender name="ArchivingFileAppender" class="org.apache.log4j.QpidCompositeRollingAppender">
+        <!-- Ensure that logs allways have the dateFormat set-->
+        <param name="StaticLogFileName" value="false"/>
+        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <param name="Append" value="false"/>
+        <!-- Change the direction so newer files have bigger numbers -->
+        <!-- So log.1 is written then log.2 etc This prevents a lot of file renames at log rollover -->
+        <param name="CountDirection" value="1"/>
+        <!-- Use default 10MB -->
+        <!--param name="MaxFileSize" value="100000"/-->
+        <param name="DatePattern" value="'.'yyyy-MM-dd-HH-mm"/>
+        <!-- Unlimited number of backups -->
+        <param name="MaxSizeRollBackups" value="-1"/>
+        <!-- Compress(gzip) the backup files-->
+        <param name="CompressBackupFiles" value="true"/>
+        <!-- Compress the backup files using a second thread -->
+        <param name="CompressAsync" value="true"/>
+        <!-- Start at zero numbered files-->
+        <param name="ZeroBased" value="true"/>
+        <!-- Backup Location -->
+        <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
+        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="AlertFile" class="org.apache.log4j.FileAppender">
+        <param name="File" value="${QPID_WORK}/log/alert.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <category name="Qpid.Broker">
+        <priority value="debug"/>
+        <appender-ref ref="AlertFile"/>
+        <!--appender-ref ref="STDOUT"/-->        
+    </category>
+
+
+    <category name="org.apache.qpid.server.queue.AMQQueueMBean">
+        <priority value="info"/>
+        <appender-ref ref="AlertFile"/>
+    </category>
+
+
+    <!-- Provide warnings to standard output -->
+    <!--category name="org.apache.qpid">
+        <priority value="warn"/>
+        <appender-ref ref="STDOUT"/>
+    </category-->
+
+
+    <!-- Additional level settings for debugging -->
+    <!-- Each class in the Broker is a category that can have its logging level adjusted. -->
+    <!-- This will provide more details if available about that classes processing. -->
+    <!--category name="org.apache.qpid.server.txn">
+        <priority value="debug"/>
+    </category>-->
+
+    <!--<category name="org.apache.qpid.server.store">
+        <priority value="debug"/>
+    </category-->
+
+    <!-- Log all info events to file -->
+    <root>
+        <priority value="info"/>
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FileAppender"/>
+    </root>
+
+</log4j:configuration>
diff --git a/java/broker/etc/log4j.xml b/java/broker/etc/log4j.xml
index 2fb7b80c96..2060246b7f 100644
--- a/java/broker/etc/log4j.xml
+++ b/java/broker/etc/log4j.xml
@@ -44,7 +44,7 @@
         <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
 
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>            
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
         </layout>
     </appender>
 
@@ -57,6 +57,15 @@
         </layout>
     </appender>
 
+    <appender name="AlertFile" class="org.apache.log4j.FileAppender">
+        <param name="File" value="${QPID_WORK}/log/alert.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
     <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
 
         <layout class="org.apache.log4j.PatternLayout">
@@ -64,15 +73,27 @@
         </layout>
     </appender>
 
-     <category name="Qpid.Broker">
+    <category name="Qpid.Broker">
+        <priority value="debug"/>
+        <appender-ref ref="AlertFile"/>
+    </category>
+
+    <category name="org.apache.qpid.server.queue.AMQQueueMBean">
         <priority value="info"/>
+        <appender-ref ref="AlertFile"/>
+    </category>
+
+    <!-- Provide warnings to standard output -->
+    <category name="org.apache.qpid">
+        <priority value="warn"/>
+        <appender-ref ref="STDOUT"/>
     </category>
 
-    <!--<category name="org.apache.qpid.server.store">
-        <priority value="debug"/>
-    </category-->
 
-    <!--category name="org.apache.qpid.server.queue">
+    <!-- Examples of additional logging settings -->
+    <!-- Used to generate extra debug. See debug.log4j.xml -->
+    
+    <!--<category name="org.apache.qpid.server.store">
         <priority value="debug"/>
     </category-->
 
@@ -80,10 +101,11 @@
         <priority value="debug"/>
     </category>-->
 
+    <!-- Log all info events to file -->
     <root>
         <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="FileAppender"/>
         <!--appender-ref ref="ArchivingFileAppender"/-->
     </root>
+
 </log4j:configuration>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 02958ded6f..b51e540c2d 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -134,14 +134,40 @@
                             <goal>ueberjar</goal>
                         </goals>
                         <configuration>
-                            <stripUnusedClasses>true</stripUnusedClasses>
+                            <stripUnusedClasses>false</stripUnusedClasses>
                             <name>[artifactId]-[version]-single.jar</name>
+                            <classifier>single</classifier>
+                            <attach>true</attach>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>attach-artifacts</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>attach-artifact</goal>
+                    </goals>
+                    <configuration>
+                        <artifacts>
+                          <artifact>
+                            <file>target/${artifactId}-${version}-single.jar</file>
+                            <type>jar</type>
+                            <classifier>single</classifier>
+                          </artifact>
+                        </artifacts>
+                    </configuration>
+                  </execution>
+                </executions>
+            </plugin>
+
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index 120475cc72..7899ef8912 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -135,7 +135,6 @@
             </plugin>
         </plugins>
 
-    
          <defaultGoal>assembly:assembly</defaultGoal>
     </build>
 
diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
index bd0d2bdd99..05df2c030b 100644
--- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
@@ -30,7 +30,7 @@
   <!-- Include the currently hardwired Apache Legal bits -->
     <fileSet>
       <directory>../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+      <outputDirectory>qpidmc</outputDirectory>
       <includes>
           <include>DISCLAIMER</include>
           <include>LICENSE</include>
@@ -90,7 +90,18 @@
       </excludes>
       <fileMode>0777</fileMode>
     </fileSet>
-   </fileSets>
+
+    <!-- Required to make eclipse load the JMXRemote SASL pluging -->
+    <!-- This should be removed as JMXRemote SASL module is not ASF license friendly -->
+    <!-- However management console doesn't seem to work without it -->
+    <fileSet>
+      <directory>../management/eclipse-plugin/src/main/resources/sasl</directory>
+      <outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory>
+      <includes>
+        <include>MANIFEST.MF</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 
   <dependencySets>
     <dependencySet>
@@ -102,7 +113,7 @@
         <exclude>org.apache.qpid:qpid-common</exclude>
         <exclude>org.apache.qpid:qpid-broker</exclude>
         <exclude>org.apache.qpid:qpid-client</exclude>
-        <exclude>commons-cli:commons-cli</exclude>        
+        <exclude>commons-cli:commons-cli</exclude>
         <exclude>commons-configuration:commons-configuration</exclude>
         <exclude>commons-lang:commons-lang</exclude>
         <exclude>org.apache.mina:mina-filter-ssl</exclude>
diff --git a/java/management/eclipse-plugin/pom.xml b/java/management/eclipse-plugin/pom.xml
index 6637460822..2ec30d212a 100644
--- a/java/management/eclipse-plugin/pom.xml
+++ b/java/management/eclipse-plugin/pom.xml
@@ -15,7 +15,7 @@
     KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
     under the License.
--->
+  -->
 <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">
 
@@ -38,17 +38,17 @@
     </properties>
     
     <repositories>
-        <repository>
+          <repository>
             <id>repo1.maven.org</id>
             <name>Maven eclipse Repository</name>
             <url>http://repo1.maven.org/eclipse</url>
-        </repository>
-        <repository>
+          </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>
+              <enabled>true</enabled>
             </snapshots>
         </repository>
     </repositories>
@@ -197,43 +197,46 @@
                 <directory>icons/</directory>
                 <targetPath>icons/</targetPath>
                 <includes>
-                    <include>**</include>
+                  <include>**</include>
                 </includes>
             </resource>
             <resource>                
                 <directory>icons/</directory>
                 <targetPath>/</targetPath>
                 <includes>
-                    <include>splash.bmp</include>
+                  <include>splash.bmp</include>
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}</directory>
-                <targetPath>/</targetPath>
-                <includes>
-                    <include>plugin.xml</include>
-                    <include>plugin.properties</include>
-                </includes>  
+              <directory>${basedir}</directory>
+              <targetPath>/</targetPath>
+              <includes>
+                <include>plugin.xml</include>
+                <include>plugin.properties</include>
+              </includes>  
             </resource>
-        </resources>
+      </resources>
         <plugins>
             <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
+            -->
 
+            <!-- This is required to identify the JAR to eclipse as a plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                    <finalName>${artifactId}_${version}</finalName>
+                  <archive>
+                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                  </archive>
+                  <finalName>${artifactId}_${version}</finalName>
                 </configuration>
-            </plugin>
+              </plugin>
 
+            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index f845b9fb44..c2fedec25a 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -79,6 +79,9 @@
                 <configuration>
                     <testSourceDirectory>${basedir}/src/main</testSourceDirectory>
                     <testClassesDirectory>target/classes</testClassesDirectory>
+                    <includes>
+                        <include>**/*Test.class</include>
+                    </includes>
                 </configuration>
             </plugin>