8:41 a.m.
Author: ataylor
Date: 2011-04-12 09:41:44 -0400 (Tue, 12 Apr 2011)
New Revision: 10487
Added:
trunk/distribution/
trunk/distribution/pom.xml
trunk/distribution/src/
trunk/distribution/src/main/
trunk/distribution/src/main/assembly/
trunk/distribution/src/main/assembly/dep.xml
trunk/distribution/src/main/resources/
trunk/distribution/src/main/resources/bin/
trunk/distribution/src/main/resources/bin/run.bat
trunk/distribution/src/main/resources/bin/run.sh
trunk/distribution/src/main/resources/bin/stop.bat
trunk/distribution/src/main/resources/bin/stop.sh
trunk/distribution/src/main/resources/licenses/
Removed:
trunk/licenses/
trunk/src/bin/run.bat
trunk/src/bin/run.sh
trunk/src/bin/stop.bat
trunk/src/bin/stop.sh
Modified:
trunk/build-hornetq.xml
trunk/hornetq.iml
trunk/hornetq.ipr
trunk/pom.xml
Log:
distribution module part 1
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/build-hornetq.xml 2011-04-12 13:41:44 UTC (rev 10487)
@@ -127,16 +127,16 @@
<property name="build.src.dir" value="${build.dir}/src"/>
<property name="src.dir" value="src"/>
<property name="src.main.dir" value="${src.dir}/main"/>
- <property name="src.config.dir" value="${src.dir}/config"/>
- <property name="src.config.standalone.non-clustered.dir"
value="${src.dir}/config/stand-alone/non-clustered"/>
- <property name="src.config.standalone.clustered.dir"
value="${src.dir}/config/stand-alone/clustered"/>
- <property name="src.config.trunk.non-clustered.dir"
value="${src.dir}/config/trunk/non-clustered"/>
- <property name="src.config.trunk.clustered.dir"
value="${src.dir}/config/trunk/clustered"/>
- <property name="src.config.jbossas4.non-clustered.dir"
value="${src.dir}/config/jboss-as-4/non-clustered"/>
- <property name="src.config.jbossas4.clustered.dir"
value="${src.dir}/config/jboss-as-4/clustered"/>
- <property name="src.config.jbossas5.non-clustered.dir"
value="${src.dir}/config/jboss-as-5/non-clustered"/>
- <property name="src.config.jbossas5.clustered.dir"
value="${src.dir}/config/jboss-as-5/clustered"/>
- <property name="src.config.service.dir"
value="${src.dir}/config/service"/>
+ <property name="src.config.dir"
value="distribution/src/main/resources/config"/>
+ <property name="src.config.standalone.non-clustered.dir"
value="distribution/src/main/resources/config/stand-alone/non-clustered"/>
+ <property name="src.config.standalone.clustered.dir"
value="distribution/src/main/resources/config/stand-alone/clustered"/>
+ <property name="src.config.trunk.non-clustered.dir"
value="distribution/src/main/resources/config/trunk/non-clustered"/>
+ <property name="src.config.trunk.clustered.dir"
value="distribution/src/main/resources/config/trunk/clustered"/>
+ <property name="src.config.jbossas4.non-clustered.dir"
value="distribution/src/main/resources/config/jboss-as-4/non-clustered"/>
+ <property name="src.config.jbossas4.clustered.dir"
value="distribution/src/main/resources/config/jboss-as-4/clustered"/>
+ <property name="src.config.jbossas5.non-clustered.dir"
value="distribution/src/main/resources/config/jboss-as-5/non-clustered"/>
+ <property name="src.config.jbossas5.clustered.dir"
value="distribution/src/main/resources/config/jboss-as-5/clustered"/>
+ <property name="src.config.service.dir"
value="distribution/src/main/resources/config/service"/>
<property name="src.schema.dir"
value="${hornetq.core.module.jar}/src/main/resources/schema"/>
<property name="src.bin.dir" value="${src.dir}/bin"/>
<property name="doc.dir" value="docs"/>
@@ -364,7 +364,7 @@
<pathelement location="${test.dir}/config"/>
<pathelement location="${test.dir}/tmpfiles"/>
<pathelement location="${test.classes.dir}"/>
- <pathelement location="${src.config.dir}/common"/>
+ <pathelement
location="distribution/src/main/resources/config/common"/>
<pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
<path refid="sun.jaxb.classpath"/>
@@ -384,7 +384,7 @@
<pathelement location="${test.dir}/config"/>
<pathelement location="${test.dir}/tmpfiles"/>
<pathelement location="${test.classes.dir}"/>
- <pathelement location="${src.config.dir}/common"/>
+ <pathelement
location="distribution/src/main/resources/config/common"/>
<pathelement location="${src.schema.dir}"/>
<path refid="test.compilation.classpath"/>
<path refid="apache.xerces.classpath"/>
@@ -406,7 +406,7 @@
<!-- as a transitive dependency from JBoss TM -->
<path refid="apache.logging.classpath"/>
<pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.dir}/common"/>
+ <pathelement
location="distribution/src/main/resources/config/common"/>
</path>
<path id="joram.test.execution.classpath">
@@ -429,7 +429,7 @@
<!-- we must include Apache commons logging -->
<!-- as a transitive dependency from JBoss TM -->
<path refid="apache.logging.classpath"/>
- <pathelement location="${src.config.dir}/common"/>
+ <pathelement
location="distribution/src/main/resources/config/common"/>
<path refid="org.jboss.naming.classpath"/>
</path>
@@ -533,7 +533,7 @@
<java classname="org.jboss.netty.util.Version"
classpathref="org.jboss.netty.classpath"
outputproperty="netty.version" fork="true"/>
<echo>setting netty version ${netty.version}</echo>
- <copy file="${src.config.dir}/common/hornetq-version.properties"
+ <copy
file="distribution/src/main/resources/config/common/hornetq-version.properties"
tofile="${build.core.client.java5.classes.dir}/hornetq-version.properties"
overwrite="true">
<filterset>
<filter token="NETTY.VERSION"
value="${netty.version}"/>
@@ -659,7 +659,7 @@
<fileset dir="${src.main.dir}">
<include name="**/jms/**/*.java"/>
</fileset>
- <fileset dir="${src.config.dir}/common">
+ <fileset dir="distribution/src/main/resources/config/common">
<include name="**/hornetq-jms.xsd"/>
</fileset>
</jar>
@@ -798,7 +798,7 @@
<exclude name="**/build"/>
<exclude name="**/data"/>
</fileset>
- <fileset dir="${src.config.dir}">
+ <fileset dir="distribution/src/main/resources/config">
<include name="jboss-as-4/**"/>
<include name="jboss-as-5/**"/>
<include name="jboss-as-6/**"/>
@@ -818,7 +818,7 @@
<exclude name="**/build"/>
<exclude name="**/data"/>
</fileset>
- <fileset dir="${src.config.dir}">
+ <fileset dir="distribution/src/main/resources/config">
<include name="jboss-as/**"/>
<include name="ra.xml"/>
<exclude name="**/build.xml"/>
@@ -914,7 +914,7 @@
<copy file="${org.jboss.netty.lib}/${netty.jar.name}"
tofile="${build.distro.lib.dir}/netty.jar"/>
<copy file="${org.twitter4j.lib}/${twitter4j.jar.name}"
tofile="${build.distro.lib.dir}/${twitter4j.jar.name}"/>
<copy todir="${build.distro.config.dir}">
- <fileset dir="${src.config.dir}">
+ <fileset dir="distribution/src/main/resources/config">
<include name="*.xml"/>
<include name="jndi.properties"/>
<include name="logging.properties"/>
@@ -964,7 +964,7 @@
<antcall target="dist-doc"/>
<copy todir="${build.distro.licenses.dir}/">
- <fileset dir="${licenses.dir}">
+ <fileset dir="distribution/src/main/resources/licenses">
<include name="**"/>
</fileset>
</copy>
@@ -1015,8 +1015,8 @@
<!-- examples-ant.properties allow the examples to be run from the source or
from the distribution -->
<!-- by configuring the correct lib/config location
-->
- <copy
tofile="${build.distro.examples.dir}/common/config/ant.properties"
file="src/config/examples-ant.properties" overwrite="true" />
- <copy
tofile="${build.distro.examples.dir}/javaee/common/config/ant.properties"
file="src/config/javaee-examples-ant.properties" overwrite="true"
/>
+ <copy
tofile="${build.distro.examples.dir}/common/config/ant.properties"
file="distribution/src/main/resources/config/examples-ant.properties"
overwrite="true" />
+ <copy
tofile="${build.distro.examples.dir}/javaee/common/config/ant.properties"
file="distribution/src/main/resources/config/javaee-examples-ant.properties"
overwrite="true" />
<zip basedir="${build.dir}"
destfile="${build.dir}/${build.artifact}.zip">
@@ -1192,7 +1192,7 @@
<property name="build.resources.dir"
value="${build.dir}/resources"/>
<mkdir dir="${build.resources.dir}"/>
<copy todir="${build.resources.dir}">
- <fileset dir="${src.config.dir}">
+ <fileset dir="distribution/src/main/resources/config">
<exclude name="*cluster*"/>
<exclude name="*standalone*"/>
<exclude name="*.properties"/>
Added: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml (rev 0)
+++ trunk/distribution/pom.xml 2011-04-12 13:41:44 UTC (rev 10487)
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>HornetQ Distribution</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: trunk/distribution/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/src/main/assembly/dep.xml (rev 0)
+++ trunk/distribution/src/main/assembly/dep.xml 2011-04-12 13:41:44 UTC (rev 10487)
@@ -0,0 +1,159 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-bootstrap</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-core</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet> <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-core-client</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-jboss-as-integration</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet> <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-jms</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-jms-client</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet> <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-logging</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-rar</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet><!--
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-rest</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>-->
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-service-sar</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-spring-integration</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-twitter-integration</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/config</directory>
+ <outputDirectory>config</outputDirectory>
+ <excludes>
+ <exclude>**/trunk/**</exclude>
+ <exclude>*.properties</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/licenses</directory>
+ <outputDirectory>licenses</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Copied: trunk/distribution/src/main/resources/bin/run.bat (from rev 10483,
trunk/src/bin/run.bat)
===================================================================
--- trunk/distribution/src/main/resources/bin/run.bat (rev 0)
+++ trunk/distribution/src/main/resources/bin/run.bat 2011-04-12 13:41:44 UTC (rev 10487)
@@ -0,0 +1,24 @@
+@ echo off
+setlocal ENABLEDELAYEDEXPANSION
+set HORNETQ_HOME=..
+IF "a%1"== "a" (
+set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
+) ELSE (
+SET CONFIG_DIR=%1
+)
+set CLASSPATH=%CONFIG_DIR%;%HORNETQ_HOME%\schemas\
+REM you can use the following line if you want to run with different ports
+REM set CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost
-Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
+set JVM_ARGS=%CLUSTER_PROPS% -XX:+UseParallelGC -XX:+AggressiveOpts
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=%CONFIG_DIR%
-Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Djava.library.path=.
+REM export JVM_ARGS="-Xmx512M
-Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties
-Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+for /R ..\lib %%A in (*.jar) do (
+SET CLASSPATH=!CLASSPATH!;%%A
+)
+mkdir ..\logs
+echo ***********************************************************************************
+echo "java %JVM_ARGS% -classpath %CLASSPATH%
org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml"
+echo ***********************************************************************************
+java %JVM_ARGS% -classpath %CLASSPATH%
org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml
+
+
+
Copied: trunk/distribution/src/main/resources/bin/run.sh (from rev 10483,
trunk/src/bin/run.sh)
===================================================================
--- trunk/distribution/src/main/resources/bin/run.sh (rev 0)
+++ trunk/distribution/src/main/resources/bin/run.sh 2011-04-12 13:41:44 UTC (rev 10487)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+export HORNETQ_HOME=..
+mkdir -p ../logs
+# By default, the server is started in the non-clustered standalone configuration
+
+if [ a"$1" = a ]; then
CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1";
fi
+if [ a"$2" = a ]; then FILENAME=hornetq-beans.xml; else
FILENAME="$2"; fi
+
+export CLASSPATH=$CONFIG_DIR:$HORNETQ_HOME/schemas/
+#you can use the following line if you want to run with different ports
+#export CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost
-Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
+export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=$CONFIG_DIR
-Djava.util.logging.config.file=$CONFIG_DIR/logging.properties
-Djava.library.path=."
+#export JVM_ARGS="-Xmx512M
-Djava.util.logging.config.file=$CONFIG_DIR/logging.properties
-Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+
+for i in `ls $HORNETQ_HOME/lib/*.jar`; do
+ CLASSPATH=$i:$CLASSPATH
+done
+
+echo
"***********************************************************************************"
+echo "java $JVM_ARGS -classpath $CLASSPATH
org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME"
+echo
"***********************************************************************************"
+java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote
org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME
\ No newline at end of file
Property changes on: trunk/distribution/src/main/resources/bin/run.sh
___________________________________________________________________
Added: svn:executable
+ *
Copied: trunk/distribution/src/main/resources/bin/stop.bat (from rev 10483,
trunk/src/bin/stop.bat)
===================================================================
--- trunk/distribution/src/main/resources/bin/stop.bat (rev 0)
+++ trunk/distribution/src/main/resources/bin/stop.bat 2011-04-12 13:41:44 UTC (rev
10487)
@@ -0,0 +1,9 @@
+@ echo off
+setlocal ENABLEDELAYEDEXPANSION
+set HORNETQ_HOME=..
+IF "a%1"== "a" (
+set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
+) ELSE (
+SET CONFIG_DIR=%1
+)
+dir >> %CONFIG_DIR%\STOP_ME
\ No newline at end of file
Copied: trunk/distribution/src/main/resources/bin/stop.sh (from rev 10483,
trunk/src/bin/stop.sh)
===================================================================
--- trunk/distribution/src/main/resources/bin/stop.sh (rev 0)
+++ trunk/distribution/src/main/resources/bin/stop.sh 2011-04-12 13:41:44 UTC (rev 10487)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export HORNETQ_HOME=..
+if [ a"$1" = a ]; then
CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1";
fi
+touch $CONFIG_DIR/STOP_ME;
\ No newline at end of file
Modified: trunk/hornetq.iml
===================================================================
--- trunk/hornetq.iml 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/hornetq.iml 2011-04-12 13:41:44 UTC (rev 10487)
@@ -4,7 +4,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/src"
isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/native/src"
isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main"
isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/java"
isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/main/java"
isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/hornetq-logging/src/main/java"
isTestSource="false" />
Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/hornetq.ipr 2011-04-12 13:41:44 UTC (rev 10487)
@@ -748,7 +748,7 @@
<library name="messaging">
<CLASSES>
<root url="file://$PROJECT_DIR$/src/config/common" />
- <root
url="file://$PROJECT_DIR$/src/config/stand-alone/non-clustered" />
+ <root
url="file://$PROJECT_DIR$/distribution/src/main/resources/config/stand-alone/non-clustered"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/pom.xml 2011-04-12 13:41:44 UTC (rev 10487)
@@ -108,6 +108,7 @@
<module>hornetq-spring-integration</module>
<module>hornetq-service-sar</module>
<module>tests</module>
+ <module>distribution</module>
</modules>
<dependencyManagement>
Deleted: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/src/bin/run.bat 2011-04-12 13:41:44 UTC (rev 10487)
@@ -1,24 +0,0 @@
-@ echo off
-setlocal ENABLEDELAYEDEXPANSION
-set HORNETQ_HOME=..
-IF "a%1"== "a" (
-set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
-) ELSE (
-SET CONFIG_DIR=%1
-)
-set CLASSPATH=%CONFIG_DIR%;%HORNETQ_HOME%\schemas\
-REM you can use the following line if you want to run with different ports
-REM set CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost
-Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
-set JVM_ARGS=%CLUSTER_PROPS% -XX:+UseParallelGC -XX:+AggressiveOpts
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=%CONFIG_DIR%
-Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Djava.library.path=.
-REM export JVM_ARGS="-Xmx512M
-Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties
-Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-for /R ..\lib %%A in (*.jar) do (
-SET CLASSPATH=!CLASSPATH!;%%A
-)
-mkdir ..\logs
-echo ***********************************************************************************
-echo "java %JVM_ARGS% -classpath %CLASSPATH%
org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml"
-echo ***********************************************************************************
-java %JVM_ARGS% -classpath %CLASSPATH%
org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml
-
-
-
Deleted: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/src/bin/run.sh 2011-04-12 13:41:44 UTC (rev 10487)
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-export HORNETQ_HOME=..
-mkdir -p ../logs
-# By default, the server is started in the non-clustered standalone configuration
-
-if [ a"$1" = a ]; then
CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1";
fi
-if [ a"$2" = a ]; then FILENAME=hornetq-beans.xml; else
FILENAME="$2"; fi
-
-export CLASSPATH=$CONFIG_DIR:$HORNETQ_HOME/schemas/
-#you can use the following line if you want to run with different ports
-#export CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost
-Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
-export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=$CONFIG_DIR
-Djava.util.logging.config.file=$CONFIG_DIR/logging.properties
-Djava.library.path=."
-#export JVM_ARGS="-Xmx512M
-Djava.util.logging.config.file=$CONFIG_DIR/logging.properties
-Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-
-for i in `ls $HORNETQ_HOME/lib/*.jar`; do
- CLASSPATH=$i:$CLASSPATH
-done
-
-echo
"***********************************************************************************"
-echo "java $JVM_ARGS -classpath $CLASSPATH
org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME"
-echo
"***********************************************************************************"
-java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote
org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME
\ No newline at end of file
Deleted: trunk/src/bin/stop.bat
===================================================================
--- trunk/src/bin/stop.bat 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/src/bin/stop.bat 2011-04-12 13:41:44 UTC (rev 10487)
@@ -1,9 +0,0 @@
-@ echo off
-setlocal ENABLEDELAYEDEXPANSION
-set HORNETQ_HOME=..
-IF "a%1"== "a" (
-set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
-) ELSE (
-SET CONFIG_DIR=%1
-)
-dir >> %CONFIG_DIR%\STOP_ME
\ No newline at end of file
Deleted: trunk/src/bin/stop.sh
===================================================================
--- trunk/src/bin/stop.sh 2011-04-12 11:31:39 UTC (rev 10486)
+++ trunk/src/bin/stop.sh 2011-04-12 13:41:44 UTC (rev 10487)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-export HORNETQ_HOME=..
-if [ a"$1" = a ]; then
CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1";
fi
-touch $CONFIG_DIR/STOP_ME;
\ No newline at end of file