From 7d02021e1405afa249b3f9c6427b3a6ea7095d15 Mon Sep 17 00:00:00 2001 From: Martin Ritchie 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 --- java/perftests/bin/setupclasspath.sh | 4 +- java/perftests/distribution/pom.xml | 110 +++++++++++++++++++++ .../distribution/src/main/assembly/performance.xml | 86 ++++++++++++++++ java/perftests/pom.xml | 17 ++-- 4 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 java/perftests/distribution/pom.xml create mode 100644 java/perftests/distribution/src/main/assembly/performance.xml (limited to 'java/perftests') diff --git a/java/perftests/bin/setupclasspath.sh b/java/perftests/bin/setupclasspath.sh index 29ca661aab..ef7a037c11 100755 --- a/java/perftests/bin/setupclasspath.sh +++ b/java/perftests/bin/setupclasspath.sh @@ -2,9 +2,11 @@ if [ -z $QPID_HOME ] ; then echo "QPID_HOME must be set" exit fi -CP=$QPID_HOME/lib/qpid-incubating.jar:../target/classes + +CP=../lib/qpid-performance.jar:$QPID_HOME/lib/qpid-incubating.jar if [ `uname -o` == "Cygwin" ] ; then CP=`cygpath --path --windows $CP` fi + diff --git a/java/perftests/distribution/pom.xml b/java/perftests/distribution/pom.xml new file mode 100644 index 0000000000..3359520706 --- /dev/null +++ b/java/perftests/distribution/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + org.apache.qpid + qpid-perftests-distribution + jar + 1.0-incubating-M2-SNAPSHOT + Qpid Performance Tests Distribution + http://cwiki.apache.org/confluence/display/qpid + + + org.apache.qpid + qpid + 1.0-incubating-M2-SNAPSHOT + + + + .. + 1.5 + ${pom.version} + ${project.build.directory} + + + + + org.apache.qpid + qpid-perftests + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.source.version} + ${java.source.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${assembly.version} + + qpid-${pom.version} + ${qpid.targetDir} + gnu + + + + + org.apache.maven.plugins + maven-jar-plugin + + qpid-performance + + + true + + + + + + + + + + maven-assembly-plugin + + + distribution-package + package + + single + + + + src/main/assembly/performance.xml + + + + + + + + + + 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 @@ + + + + performance-test-java + false + + tar.gz + zip + + + + + ../../resources + qpid-${qpid.version} + + DISCLAIMER + LICENSE.txt + NOTICE.txt + README.txt + + + + .. + qpid-${qpid.version} + + *.txt + + + + ../../release-docs + qpid-${qpid.version}/docs + + RELEASE_NOTES.txt + + + + ../bin + qpid-${qpid.version}/bin + + * + + + + ../src/main + qpid-${qpid.version}/src + + **/*.java + **/*.log4j + + + + + target + qpid-${qpid.version}/lib + + qpid-performance.jar + + + + + + qpid-${qpid.version}/lib + false + + org.apache.qpid:qpid-perftests-distribution + + + +G diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml index 9ca30da0ae..98d2696b80 100644 --- a/java/perftests/pom.xml +++ b/java/perftests/pom.xml @@ -57,8 +57,10 @@ true + - + + src/ @@ -69,13 +71,14 @@ - - false - src/main/java - - perftests.log4j - + src/ + false + src/main/java + + perftests.log4j + + -- cgit v1.2.1