From 7d02021e1405afa249b3f9c6427b3a6ea7095d15 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 12 Jan 2007 01:03:21 +0000
Subject: 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
---
 .../distribution/src/main/assembly/performance.xml | 86 ++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 java/perftests/distribution/src/main/assembly/performance.xml

(limited to 'java/perftests/distribution/src')

diff --git a/java/perftests/distribution/src/main/assembly/performance.xml b/java/perftests/distribution/src/main/assembly/performance.xml
new file mode 100644
index 0000000000..36daeb6760
--- /dev/null
+++ b/java/perftests/distribution/src/main/assembly/performance.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+  <id>performance-test-java</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>../../resources</directory>
+      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+      <includes>
+          <include>DISCLAIMER</include>
+          <include>LICENSE.txt</include>
+          <include>NOTICE.txt</include>
+          <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+      <includes>
+          <include>*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../../release-docs</directory>
+      <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+      <includes>
+          <include>RELEASE_NOTES.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../bin</directory>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <includes>
+          <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../src/main</directory>
+      <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
+      <includes>
+          <include>**/*.java</include>
+          <include>**/*.log4j</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+          <directory>target</directory>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <includes>
+              <include>qpid-performance.jar</include>
+          </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+      <unpack>false</unpack>
+      <excludes>
+        <exclude>org.apache.qpid:qpid-perftests-distribution</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+G</assembly>
-- 
cgit v1.2.1