You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2012/10/02 11:08:36 UTC
svn commit: r1392799 - in /activemq/trunk: assembly/pom.xml
assembly/src/main/descriptors/common-bin.xml
assembly/src/main/descriptors/unix-bin.xml
assembly/src/release/example/perfharness/perfharness-activemq.sh pom.xml
Author: davsclaus
Date: Tue Oct 2 09:08:36 2012
New Revision: 1392799
URL: http://svn.apache.org/viewvc?rev=1392799&view=rev
Log:
AMQ-4088: Fixed kit to include httpclient/core. Trying to include execute permission on tarbal for scripts in examples.
Modified:
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh
activemq/trunk/pom.xml
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1392799&r1=1392798&r2=1392799&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Oct 2 09:08:36 2012
@@ -136,6 +136,10 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1392799&r1=1392798&r2=1392799&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Oct 2 09:08:36 2012
@@ -144,7 +144,6 @@
<include>${pom.groupId}:activeio-core</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
<include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include>
<include>commons-codec:commons-codec</include>
@@ -153,6 +152,8 @@
<include>org.slf4j:slf4j-log4j12</include>
<include>log4j:log4j</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.apache.httpcomponents:httpclient</include>
+ <include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-asm</include>
Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1392799&r1=1392798&r2=1392799&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Oct 2 09:08:36 2012
@@ -72,6 +72,8 @@
<include>bin/activemq-admin</include>
<include>bin/macosx/activemq</include>
<include>bin/linux-*/activemq</include>
+ <include>example/**/*.sh</include>
+ <include>example/**/*.rb</include>
</includes>
<directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
Modified: activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh?rev=1392799&r1=1392798&r2=1392799&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh (original)
+++ activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh Tue Oct 2 09:08:36 2012
@@ -22,7 +22,7 @@
# Sample Usage:
# ./perfharness-activemq.sh -d dynamicQueues/FOO -tc jms.r11.PutGet -nt 6
#
-# It assumes that the apache-activemq-5.0-SNAPSHOT.jar and
+# It assumes that the apache-activemq JAR and
# perfharness.jar files are in the current directory. If they are not,
# set the ACTIVEMQ_HOME and PERFHARNESS_HOME env variable to the correct location.
#
@@ -46,4 +46,4 @@ if [ -z "$BROKER_URL" ] ; then
BROKER_URL='vm://(broker://()/localhost?useJmx=false)/localhost'
fi
-java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-5.0-SNAPSHOT.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
+java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-${project.version}.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1392799&r1=1392798&r2=1392799&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Oct 2 09:08:36 2012
@@ -70,6 +70,7 @@
<howl-version>0.1.8</howl-version>
<hsqldb-version>1.8.0.10</hsqldb-version>
<httpclient-version>4.2.1</httpclient-version>
+ <httpcore-version>4.2.1</httpcore-version>
<jackson-version>1.9.2</jackson-version>
<jasypt-version>1.9.0</jasypt-version>
<jdom-version>1.0</jdom-version>
@@ -829,6 +830,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>${aopalliance-version}</version>