You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2017/05/03 15:46:19 UTC
[3/3] activemq-cli-tools git commit: AMQCLI-3 - Add LICENSE and
NOTICE to binary
AMQCLI-3 - Add LICENSE and NOTICE to binary
(cherry picked from commit fc20f15942ce52b0e6449425aff0b49bfef9ea85)
Project: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/commit/9c6f8364
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/9c6f8364
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/9c6f8364
Branch: refs/heads/0.1.x
Commit: 9c6f8364e31afc9f93cc747e0cbda1efd1721fd1
Parents: 23e7182
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Wed May 3 11:42:33 2017 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Wed May 3 11:45:53 2017 -0400
----------------------------------------------------------------------
assembly/pom.xml | 2 +-
assembly/src/main/resources/bin/export | 107 ----------
.../src/main/resources/conf/log4j.properties | 35 ----
.../src/main/resources/descriptors/unix-bin.xml | 60 ++++++
assembly/src/main/resources/release/LICENSE | 203 +++++++++++++++++++
assembly/src/main/resources/release/NOTICE | 5 +
assembly/src/main/resources/release/README.md | 66 ++++++
assembly/src/main/resources/release/bin/export | 107 ++++++++++
.../resources/release/conf/log4j.properties | 35 ++++
assembly/src/main/resources/unix-bin.xml | 67 ------
10 files changed, 477 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6c97782..9a704a2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -49,7 +49,7 @@
<execution>
<id>source</id>
<configuration>
- <descriptor>src/main/resources/unix-bin.xml</descriptor>
+ <descriptor>src/main/resources/descriptors/unix-bin.xml</descriptor>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
<phase>package</phase>
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/bin/export
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/bin/export b/assembly/src/main/resources/bin/export
deleted file mode 100644
index 0ccc33b..0000000
--- a/assembly/src/main/resources/bin/export
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env sh
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# a simple helper to get the current user
-setCurrentUser(){
- CUSER="`whoami 2>/dev/null`"
- # Solaris hack
- if [ ! $? -eq 0 ]; then
- CUSER="`/usr/ucb/whoami 2>/dev/null`"
- fi
-}
-
-# get a canonical path, macosx and slowlaris does not support radlink -f :-)
-pathCanonical() {
- local dst="${1}"
- while [ -h "${dst}" ] ; do
- ls=`ls -ld "${dst}"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- dst="$link"
- else
- dst="`dirname "${dst}"`/$link"
- fi
- done
- local bas="`basename "${dst}"`"
- local dir="`dirname "${dst}"`"
- if [ "$bas" != "$dir" ]; then
- dst="`pathCanonical "$dir"`/$bas"
- fi
- echo "${dst}" | sed -e 's#//#/#g' -e 's#/\./#/#g' -e 's#/[^/]*/\.\./#/#g'
-}
-
-
-# a simple helper to get the activemq installation dir
-getActiveMQHome(){
- # get the real path to the binary
- local REAL_BIN="`pathCanonical $0`"
- local REAL_DIR="`dirname $REAL_BIN`/../"
- REAL_DIR="`cd $REAL_DIR && pwd -P`"
- if [ -z "$REAL_DIR" ];then
- echo 'ERROR: unable to find real installtion path fo activemq, you have to define ACTIVEMQ_HOME manually in the config' >&2
- exit 1
- fi
- echo "$REAL_DIR/"
-
-}
-
-# Active MQ installation dir
-if [ -z "$ACTIVEMQ_HOME" ] ; then
- ACTIVEMQ_HOME="`getActiveMQHome`"
-fi
-
-# Active MQ base dir
-if [ -z "$ACTIVEMQ_BASE" ] ; then
- ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
-fi
-
-# Configure user specified classpath here or externally using this variable
-if [ -z "$ACTIVEMQ_USER_CLASSPATH" ] ; then
- ACTIVEMQ_USER_CLASSPATH=""
-fi
-
-# ActiveMQ Classpath configuration
-ACTIVEMQ_CLASSPATH="$ACTIVEMQ_BASE/lib/*:$ACTIVEMQ_BASE/conf/:$ACTIVEMQ_USER_CLASSPATH"
-
-ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data/"
-
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=java
- fi
-fi
-
-
-JAVA_ARGS=
-
-exec "$JAVACMD" \
- $JAVA_ARGS \
- -classpath "$ACTIVEMQ_CLASSPATH" \
- -Dactivemq.data=${ACTIVEMQ_DATA} \
- $DEBUG_ARGS \
- org.apache.activemq.cli.kahadb.exporter.Exporter "$@"
-
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/conf/log4j.properties b/assembly/src/main/resources/conf/log4j.properties
deleted file mode 100644
index e4f054a..0000000
--- a/assembly/src/main/resources/conf/log4j.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-log4j.logger.org.apache.activemq=INFO
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=${activemq.data}/activemq-exporter.log
-log4j.appender.out.append=true
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/descriptors/unix-bin.xml b/assembly/src/main/resources/descriptors/unix-bin.xml
new file mode 100644
index 0000000..045ba8d
--- /dev/null
+++ b/assembly/src/main/resources/descriptors/unix-bin.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<assembly>
+
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+
+ <dependencySets>
+ <dependencySet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>bin/**</exclude>
+ </excludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <lineEnding>unix</lineEnding>
+ <filtered>false</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/**</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <lineEnding>unix</lineEnding>
+ <filtered>false</filtered>
+ </fileSet>
+ </fileSets>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/release/LICENSE
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/release/LICENSE b/assembly/src/main/resources/release/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/assembly/src/main/resources/release/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/release/NOTICE
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/release/NOTICE b/assembly/src/main/resources/release/NOTICE
new file mode 100644
index 0000000..7c05520
--- /dev/null
+++ b/assembly/src/main/resources/release/NOTICE
@@ -0,0 +1,5 @@
+Apache ActiveMQ CLI Tools
+Copyright 2012-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/release/README.md
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/release/README.md b/assembly/src/main/resources/release/README.md
new file mode 100644
index 0000000..cefaa36
--- /dev/null
+++ b/assembly/src/main/resources/release/README.md
@@ -0,0 +1,66 @@
+Apache ActiveMQ Command Line Tools
+==================================
+
+The ActiveMQ Command Line Tools project is home to several CLI based projects
+useful for users of the ActiveMQ and ActiveMQ Artemis messaging brokers
+
+## ActiveMQ KahaDB Export Tool
+
+This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML format. The resulting XML document can then be imported into an Artemis broker (version 2.0.0+) using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/artemis/docs/2.0.0/tools.html)
+
+### Usage
+```
+$ ./bin/export help
+usage: export <command> [<args>]
+
+The most commonly used export commands are:
+ help Display help information
+ kahadb Export a KahaDb store to Artemis XML
+ mkahadb Export a MultiKahaDb store to Artemis XML
+
+See 'export help <command>' for more information on a specific command.
+```
+```
+$ ./bin/export help kahadb
+NAME
+ export kahadb - Export a KahaDb store to Artemis XML
+
+SYNOPSIS
+ export kahadb [-c] [-f]
+ [(--qp <queuePattern> | --queuePattern <queuePattern>)]
+ (-s <source> | --source <source>) (-t <target> | --target <target>)
+ [(--tp <topicPattern> | --topicPattern <topicPattern>)]
+
+OPTIONS
+ -c
+ Compress output xml file using gzip
+
+ -f
+ Force XML output and overwrite existing file
+
+ --qp <queuePattern>, --queuePattern <queuePattern>
+ Queue Export Pattern
+
+ -s <source>, --source <source>
+ Data store directory location
+
+ -t <target>, --target <target>
+ Xml output file location
+
+ --tp <topicPattern>, --topicPattern <topicPattern>
+ Topic Export Pattern
+```
+
+### Examples:
+
+Export entire store:
+
+`./bin/export kahadb --source /some/directory/kahadb/ --target ~/some/directory/output.xml`
+
+Export entire store and compress the resulting xml:
+
+`./bin/export kahadb --source /some/directory/kahadb/ --target ~/some/directory/output.xml -c`
+
+Export all topics but only queues matching pattern:
+
+`./bin/export kahadb --qp test.queue.> --source /some/directory/kahadb/ --target ~/some/directory/output.xml`
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/release/bin/export
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/release/bin/export b/assembly/src/main/resources/release/bin/export
new file mode 100644
index 0000000..0ccc33b
--- /dev/null
+++ b/assembly/src/main/resources/release/bin/export
@@ -0,0 +1,107 @@
+#!/usr/bin/env sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+# a simple helper to get the current user
+setCurrentUser(){
+ CUSER="`whoami 2>/dev/null`"
+ # Solaris hack
+ if [ ! $? -eq 0 ]; then
+ CUSER="`/usr/ucb/whoami 2>/dev/null`"
+ fi
+}
+
+# get a canonical path, macosx and slowlaris does not support radlink -f :-)
+pathCanonical() {
+ local dst="${1}"
+ while [ -h "${dst}" ] ; do
+ ls=`ls -ld "${dst}"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ dst="$link"
+ else
+ dst="`dirname "${dst}"`/$link"
+ fi
+ done
+ local bas="`basename "${dst}"`"
+ local dir="`dirname "${dst}"`"
+ if [ "$bas" != "$dir" ]; then
+ dst="`pathCanonical "$dir"`/$bas"
+ fi
+ echo "${dst}" | sed -e 's#//#/#g' -e 's#/\./#/#g' -e 's#/[^/]*/\.\./#/#g'
+}
+
+
+# a simple helper to get the activemq installation dir
+getActiveMQHome(){
+ # get the real path to the binary
+ local REAL_BIN="`pathCanonical $0`"
+ local REAL_DIR="`dirname $REAL_BIN`/../"
+ REAL_DIR="`cd $REAL_DIR && pwd -P`"
+ if [ -z "$REAL_DIR" ];then
+ echo 'ERROR: unable to find real installtion path fo activemq, you have to define ACTIVEMQ_HOME manually in the config' >&2
+ exit 1
+ fi
+ echo "$REAL_DIR/"
+
+}
+
+# Active MQ installation dir
+if [ -z "$ACTIVEMQ_HOME" ] ; then
+ ACTIVEMQ_HOME="`getActiveMQHome`"
+fi
+
+# Active MQ base dir
+if [ -z "$ACTIVEMQ_BASE" ] ; then
+ ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
+fi
+
+# Configure user specified classpath here or externally using this variable
+if [ -z "$ACTIVEMQ_USER_CLASSPATH" ] ; then
+ ACTIVEMQ_USER_CLASSPATH=""
+fi
+
+# ActiveMQ Classpath configuration
+ACTIVEMQ_CLASSPATH="$ACTIVEMQ_BASE/lib/*:$ACTIVEMQ_BASE/conf/:$ACTIVEMQ_USER_CLASSPATH"
+
+ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data/"
+
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=java
+ fi
+fi
+
+
+JAVA_ARGS=
+
+exec "$JAVACMD" \
+ $JAVA_ARGS \
+ -classpath "$ACTIVEMQ_CLASSPATH" \
+ -Dactivemq.data=${ACTIVEMQ_DATA} \
+ $DEBUG_ARGS \
+ org.apache.activemq.cli.kahadb.exporter.Exporter "$@"
+
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/release/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/release/conf/log4j.properties b/assembly/src/main/resources/release/conf/log4j.properties
new file mode 100644
index 0000000..e4f054a
--- /dev/null
+++ b/assembly/src/main/resources/release/conf/log4j.properties
@@ -0,0 +1,35 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, out, stdout
+
+log4j.logger.org.apache.activemq=INFO
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=${activemq.data}/activemq-exporter.log
+log4j.appender.out.append=true
http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c6f8364/assembly/src/main/resources/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/unix-bin.xml b/assembly/src/main/resources/unix-bin.xml
deleted file mode 100644
index 7c34ae0..0000000
--- a/assembly/src/main/resources/unix-bin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
-
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
-
- <dependencySets>
- <dependencySet>
- <directoryMode>755</directoryMode>
- <fileMode>644</fileMode>
- <outputDirectory>lib</outputDirectory>
-
- <unpack>false</unpack>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <!-- >includes>
- <include>org.apache.activemq:activemq-kahadb-exporter</include>
- </includes-->
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>export</include>
- </includes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <lineEnding>unix</lineEnding>
- <filtered>false</filtered>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- <lineEnding>unix</lineEnding>
- <filtered>false</filtered>
- </fileSet>
- </fileSets>
-
-</assembly>