QPID-146 QPID-112 QPID-278

Summary
Reworked a lot of the distribution work done by the build system.
This ended up with me creating a reduced client distribution (hope that is ok Steve)
Each module now has has a distribution directory (except common it may need a tests build later) This will build the individual components in to a distribution binary only, binary with tests and source.

To build the binary with tests in the distribution directory use profile tests so $mvn -Ptests

In all cases the dependencies have been reduced and correctly assigned to the correct scope.
There were a couple of cases where a runtime dependency of one of our dependencies didn't make it in to the distributions so they were added explicitly. This should be looked at again.

Specifics
Broker:
Three new assembly files are located in the distribution/src directory (broker-bin taking heavily from distribution - bin) these generate the three distributions.

SimpleFilterManager.java removed slf4j reference

broker/test directory removed as it was left over from the ant system

Client:
Added intelij files to ignore list.

client/dist deleted as it was left over from the ant system

client/distribution as for the broker three assemblies matching the three distributions

Renamed log4j.properties to client.log4j to prevent issues when it is packaged into the jar.

Removed old_test ping and requestreply1 as they have been moved to perftests

Moved broker back to a test dependency. This required modifying AMQSession.java to remove reference to ExchangeBoundHandler.java

Common:

Added more common dependencies from broker and client here.

Distribution:

Reduced the assemblies to only build the full project binary, binary with tests and source.

Perftests:
Added building of perftests distribution so this can be bundled separately.

Resources:
Moved Resources from distribution project to root level this allows them to be easily incorporated in all projects.

Systests:
as with perftests now builds a separate distribution that can be used on an existing installation.
renamed log4j.properties to systests.log4j to prevent logging problems.

As systests is a module having the code under the test folder isn't accurate as it is the main code. Test code here should be testing the tests :D !! 




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

1 files changed, 79 insertions, 35 deletions

diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index 59b4107454..c662ef2038 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -16,7 +16,10 @@
   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">
+<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-distribution</artifactId>
@@ -36,7 +39,7 @@
         <qpid.version>${pom.version}</qpid.version>
         <qpid.targetDir>${project.build.directory}</qpid.targetDir>
     </properties>
-    
+   
     <repositories>
       <repository>
         <id>repo1.maven.org</id>
@@ -48,36 +51,21 @@
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>qpid-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>qpid-broker</artifactId>
             <version>${pom.version}</version>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>qpid-client</artifactId>
             <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>qpid-perftests</artifactId>
-            <version>${pom.version}</version>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}.management</groupId>
             <artifactId>org.apache.qpid.management.ui</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>qpid-systests</artifactId>
-            <version>${pom.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -96,9 +84,6 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>${assembly.version}</version>
                     <configuration>
-                        <descriptors>
-                            <descriptor>src/main/assembly/bin.xml</descriptor>
-                        </descriptors>
                         <finalName>qpid-${pom.version}</finalName>
                         <outputDirectory>${qpid.targetDir}</outputDirectory>
                         <tarLongFileMode>gnu</tarLongFileMode>
@@ -118,14 +103,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
+
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -139,11 +117,7 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/bin.xml</descriptor>
-                                <descriptor>src/main/assembly/client-bin.xml</descriptor>
                                 <descriptor>src/main/assembly/src.xml</descriptor>
-                                <descriptor>src/main/assembly/management-eclipse-plugin.xml</descriptor>
-                                <descriptor>src/main/assembly/management-eclipse-plugin-unix.xml</descriptor>
-                                <descriptor>src/main/assembly/tests.xml</descriptor>
                             </descriptors>
                             <finalName>qpid-${pom.version}</finalName>
                         </configuration>
@@ -152,4 +126,74 @@
             </plugin>
         </plugins>
     </build>
-</project>
+
+    <profiles>
+        <profile>
+            <id>tests</id>
+
+            <dependencies>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-broker</artifactId>
+                    <version>${pom.version}</version>
+                    <type>jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-broker</artifactId>
+                    <version>${pom.version}</version>
+                    <type>test-jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-client</artifactId>
+                    <version>${pom.version}</version>
+                    <type>jar</type>
+                </dependency>
+                 <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-client</artifactId>
+                    <version>${pom.version}</version>
+                    <type>test-jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-perftests</artifactId>
+                    <version>${pom.version}</version>
+                    <type>test-jar</type>
+                </dependency>
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>qpid-systests</artifactId>
+                    <version>${pom.version}</version>
+                    <type>test-jar</type>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>distribution-package</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/bin-test.xml</descriptor>
+                                </descriptors>
+                                <finalName>qpid-${pom.version}</finalName>
+                            </configuration>
+                        </execution>
+                        </executions>
+                    </plugin>
+               </plugins>
+            </build>
+
+        </profile>
+    </profiles>
+
+</project>