Skip to content

Commit

Permalink
Merge pull request hornetq#1907 from andytaylor/master
Browse files Browse the repository at this point in the history
distribution fixes
  • Loading branch information
clebertsuconic committed Oct 13, 2014
2 parents c132cac + fba0ae9 commit 643cc6c
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 15 deletions.
3 changes: 3 additions & 0 deletions distribution/hornetq/src/main/assembly/dep.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@
<!-- dependencies -->
<include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include>
<include>org.jboss.naming:jnpserver</include>
<include>org.jboss.logmanager:jboss-logmanager</include>
<include>org.jboss:jboss-common-core</include>
<include>io.netty:netty-all</include>
<include>org.apache.qpid:proton</include>
<include>org.apache.qpid:proton-j</include>
<include>org.apache.qpid:proton-jms</include>
<include>org.apache.activemq:activemq-client</include>
<include>org.slf4j:slf4j-api</include>
Expand Down
2 changes: 1 addition & 1 deletion distribution/hornetq/src/main/resources/bin/hornetq
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ for i in `ls $HORNETQ_HOME/lib/*.jar`; do
done


JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/lib/linux-i686:$HORNETQ_HOME/lib/linux-x86_64"
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/bin/lib/linux-i686:$HORNETQ_HOME/bin/lib/linux-x86_64"
#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"

exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.hornetq.cli.HornetQ $@
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<broker xmlns="http://hornetq.org/schema">

<core configuration="${hornetq.home}/config/stand-alone/clustered/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/stand-alone/clustered/hornetq-jms.xml"></jms>
<core configuration="${hornetq.home}/config/clustered/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/clustered/hornetq-jms.xml"></jms>

<basic-security/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<broker xmlns="http://hornetq.org/schema">

<core configuration="${hornetq.home}/config/stand-alone/non-clustered/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/stand-alone/non-clustered/hornetq-jms.xml"></jms>
<core configuration="${hornetq.home}/config/non-clustered/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/non-clustered/hornetq-jms.xml"></jms>

<basic-security/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<broker xmlns="http://hornetq.org/schema">

<core configuration="${hornetq.home}/config/stand-alone/replicated/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/stand-alone/replicated/hornetq-jms.xml"></jms>
<core configuration="${hornetq.home}/config/replicated/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/replicated/hornetq-jms.xml"></jms>

<basic-security/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
if you want to run this as a backup on different ports you would need to set the following variable
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-->
<shared-store>false</shared-store>

<backup>false</backup>

<paging-directory>${data.dir:../data}/paging</paging-directory>

Expand Down Expand Up @@ -74,6 +71,12 @@
<discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection>
</cluster-connections>

<ha-policy>
<replication>
<master/>
</replication>
</ha-policy>

<security-settings>
<security-setting match="#">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<broker xmlns="http://hornetq.org/schema">

<core configuration="${hornetq.home}/config/stand-alone/shared-store/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/stand-alone/shared-store/hornetq-jms.xml"></jms>
<core configuration="${hornetq.home}/config/shared-store/hornetq-configuration.xml"></core>
<jms configuration="${hornetq.home}/config/shared-store/hornetq-jms.xml"></jms>

<basic-security/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
if you want to run this as a backup on different ports you would need to set the following variable
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-->
<shared-store>true</shared-store>

<backup>false</backup>

<paging-directory>${data.dir:../data}/paging</paging-directory>

Expand Down Expand Up @@ -74,6 +71,12 @@
<discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection>
</cluster-connections>

<ha-policy>
<shared-store>
<master/>
</shared-store>
</ha-policy>

<security-settings>
<security-setting match="#">
Expand Down

0 comments on commit 643cc6c

Please sign in to comment.