mirror of https://github.com/apache/activemq.git
Fix for maven jar and dist build.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@395771 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Frederick G. Oconer
parent
c2aad2a074
commit
8a07f91304
|
|
@ -22,56 +22,74 @@
|
|||
xmlns:artifact="artifact"
|
||||
>
|
||||
|
||||
<goal name="rebuild">
|
||||
<attainGoal name="clean"/>
|
||||
<attainGoal name="default"/>
|
||||
</goal>
|
||||
<goal name="default">
|
||||
<attainGoal name="clean"/>
|
||||
<attainGoal name="dist:build-bin"/>
|
||||
</goal>
|
||||
|
||||
|
||||
<postGoal name="jar:jar">
|
||||
<move file="target\${maven.final.name}.jar" todir="${jmeter.home}\lib\ext" overwrite="true"/>
|
||||
<goal
|
||||
name="dist:prepare-bin-filesystem"
|
||||
prereqs="jar:install"
|
||||
description="Builds the binary distribution file system.">
|
||||
|
||||
<!--
|
||||
This is the directory where everything is copied to so that it can
|
||||
be archived.
|
||||
-->
|
||||
|
||||
<ant:delete dir="${maven.dist.bin.assembly.dir}"/>
|
||||
<ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
|
||||
<ant:mkdir dir="${maven.build.dir}/unjar"/>
|
||||
|
||||
<ant:echo>
|
||||
${maven.dist.bin.assembly.dir}
|
||||
+-------------------------------------------------------+
|
||||
| C R E A T I N G J M E T E R B I N A R Y D I S T R I B U T I O N |
|
||||
+-------------------------------------------------------+
|
||||
</ant:echo>
|
||||
|
||||
<copy file="target\${maven.final.name}.jar" todir="${maven.dist.bin.assembly.dir}\lib\ext" overwrite="true"/>
|
||||
|
||||
<!-- copy JMeter TestPlans -->
|
||||
<copy todir="${jmeter.home}\bin\testfiles" overwrite="true">
|
||||
<copy todir="${maven.dist.bin.assembly.dir}\bin\testfiles" overwrite="true">
|
||||
<fileset dir="resource\TestPlans"/>
|
||||
</copy>
|
||||
|
||||
|
||||
<!-- jmeter bin files -->
|
||||
<copy file="resource\jmeter" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-server" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter.bat" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-n.bat" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-server.bat" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-t.bat" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeterw.bat" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellAssertion.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellFunction.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellSampler.bshrc" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\log4j.conf" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\users.dtd" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter.properties" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmetertest.properties" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\saveservice.properties" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\upgrade.properties" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\logkit.xml" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
<copy file="resource\users.xml" todir="${jmeter.home}\bin" overwrite="true"/>
|
||||
|
||||
<copy file="resource\jar_usage.txt" todir="${jmeter.home}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(jdom).txt" todir="${jmeter.home}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(jtidy).txt" todir="${jmeter.home}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(XPP3).txt" todir="${jmeter.home}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(XStream).txt" todir="${jmeter.home}\lib" overwrite="true"/>
|
||||
|
||||
|
||||
<j:set var="binDir" value="${jmeter.home}/bin"/>
|
||||
<j:set var="libDir" value="${jmeter.home}/lib"/>
|
||||
<j:set var="extDir" value="${jmeter.home}/lib/ext"/>
|
||||
<ant:mkdir dir="${libDir}"/>
|
||||
<ant:mkdir dir="${extDir}"/>
|
||||
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<!-- jmeter bin files -->
|
||||
<copy file="resource\jmeter" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-server" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter.bat" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-n.bat" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-server.bat" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter-t.bat" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeterw.bat" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellAssertion.bshrc" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellFunction.bshrc" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellSampler.bshrc" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\BeanShellSampler.bshrc" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\log4j.conf" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\users.dtd" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmeter.properties" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\jmetertest.properties" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\saveservice.properties" todir="${maven.dist.bin.assembly.dire}\bin" overwrite="true"/>
|
||||
<copy file="resource\upgrade.properties" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\logkit.xml" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
<copy file="resource\users.xml" todir="${maven.dist.bin.assembly.dir}\bin" overwrite="true"/>
|
||||
|
||||
<copy file="resource\jar_usage.txt" todir="${maven.dist.bin.assembly.dir}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(jdom).txt" todir="${maven.dist.bin.assembly.dir}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(jtidy).txt" todir="${maven.dist.bin.assembly.dir}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(XPP3).txt" todir="${maven.dist.bin.assembly.dir}\lib" overwrite="true"/>
|
||||
<copy file="resource\LICENSE(XStream).txt" todir="${maven.dist.bin.assembly.dir}\lib" overwrite="true"/>
|
||||
|
||||
<j:set var="binDir" value="${maven.dist.bin.assembly.dir}/bin"/>
|
||||
<j:set var="libDir" value="${maven.dist.bin.assembly.dir}/lib"/>
|
||||
<j:set var="extDir" value="${maven.dist.bin.assembly.dir}/lib/ext"/>
|
||||
|
||||
<ant:mkdir dir="${libDir}"/>
|
||||
<ant:mkdir dir="${extDir}"/>
|
||||
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<j:set var="dependency" value="${artifact.dependency}"/>
|
||||
<echo>${artifact.path}</echo>
|
||||
<j:if test="${dependency.getProperty('bin') == 'true'}">
|
||||
|
|
@ -80,9 +98,9 @@
|
|||
<j:set var="classpath" value="${classpath} ../bin/${artifact.name}"/>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
</j:forEach>
|
||||
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<j:set var="dependency" value="${artifact.dependency}"/>
|
||||
<echo>${artifact.path}</echo>
|
||||
<j:if test="${dependency.getProperty('lib') == 'true'}">
|
||||
|
|
@ -91,9 +109,9 @@
|
|||
<j:set var="classpath" value="${classpath} ../lib/${artifact.name}"/>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
</j:forEach>
|
||||
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<j:forEach var="artifact" items="${pom.artifacts}">
|
||||
<j:set var="dependency" value="${artifact.dependency}"/>
|
||||
<echo>${artifact.path}</echo>
|
||||
<j:if test="${dependency.getProperty('ext') == 'true'}">
|
||||
|
|
@ -102,18 +120,6 @@
|
|||
<j:set var="classpath" value="${classpath} ../lib/ext/${artifact.name}"/>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
|
||||
<ant:zip zipfile="${jmeter.home}\..\${activemq.jmeter.distribution.name}-${pom.currentVersion}.zip" basedir="${jmeter.home}\"></ant:zip>
|
||||
|
||||
</postGoal>
|
||||
|
||||
<goal name="clean">
|
||||
<ant:echo>+-----------------------------------------------------+</ant:echo>
|
||||
<ant:echo>| Cleaning: ${basedir}\target </ant:echo>
|
||||
<ant:echo>+-----------------------------------------------------+</ant:echo>
|
||||
<delete dir="${basedir}/target"/>
|
||||
</j:forEach>
|
||||
</goal>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
@ -14,26 +14,29 @@
|
|||
# limitations under the License.
|
||||
# ------------------------------------------------------------------------
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Build Properties
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# change this property to point to your jmeter home folder
|
||||
jmeter.home = ${maven.build.dir}/jmeter
|
||||
|
||||
# change this property to point to your jmeter home folder
|
||||
activemq.jmeter.distribution.name = activemq-jmeter
|
||||
maven.dist.assembly.dir=${maven.build.dir}/${maven.final.name}
|
||||
maven.dist.bin.archive.dir=${maven.dist.assembly.dir}/bin
|
||||
maven.dist.src.archive.dir=${maven.dist.assembly.dir}/src
|
||||
maven.dist.bin.assembly.dir=${maven.dist.assembly.dir}/bin/${maven.final.name}
|
||||
maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}
|
||||
maven.dist.dir=${maven.build.dir}/distributions
|
||||
maven.dist.tar.executable=tar
|
||||
maven.dist.gunzip.executable=gunzip
|
||||
|
||||
# ------------------------------------------------------------------------
|
||||
# M A V E N P R O P E R T I E S
|
||||
# ------------------------------------------------------------------------
|
||||
maven.final.name=APacheJMeter_activemq
|
||||
maven.repo.remote=http://www.ibiblio.org/maven/, http://cvs.apache.org/repository, http://dist.codehaus.org, http://people.apache.org/~foconer/repository/
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------
|
||||
# M A V E N J A R O V E R R I D E
|
||||
# ------------------------------------------------------------------------
|
||||
maven.jar.override = off
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------
|
||||
# J A R S V E R S I O N N U M B ER
|
||||
# ------------------------------------------------------------------------
|
||||
|
|
@ -87,4 +90,4 @@ antlr_version=2.7.2
|
|||
# Jars set explicity by path.
|
||||
# ------------------------------------------------------------------------
|
||||
# maven.jar.jorphan = ${maven.repo.local}/jorphan/jars/jorphan-1.0.jar
|
||||
# maven.jar.ApacheJMeter_core = ${maven.repo.local}/jmeter/jars/ApacheJMeter_core-1.1.jar
|
||||
# maven.jar.ApacheJMeter_core = ${maven.repo.local}/jmeter/jars/ApacheJMeter_core-1.1.jar
|
||||
|
|
@ -17,21 +17,12 @@
|
|||
<project>
|
||||
<pomVersion>3</pomVersion>
|
||||
<extend>${basedir}/../etc/project.xml</extend>
|
||||
|
||||
<name>ActiveMQ :: Jmeter</name>
|
||||
<id>JMeter_sampler</id>
|
||||
<artifactId>activemq-jmeter</artifactId>
|
||||
<shortDescription>ActiveMQ JMeter</shortDescription>
|
||||
<description>ActiveMQ Jmeter creates an ActiveMQ sampler for Jmeter</description>
|
||||
|
||||
<!-- <package>org.apache.activemq</package>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>src/java</sourceDirectory>
|
||||
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
|
||||
</build>
|
||||
-->
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-core</artifactId>
|
||||
|
|
@ -41,7 +32,6 @@
|
|||
<lib>true</lib>
|
||||
</properties>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>jorphan</groupId>
|
||||
<artifactId>jorphan</artifactId>
|
||||
|
|
@ -51,7 +41,6 @@
|
|||
<lib>true</lib>
|
||||
</properties>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activeio-core</artifactId>
|
||||
|
|
@ -532,4 +521,4 @@
|
|||
</unitTest>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
Loading…
Reference in New Issue