activemq-cli-tools git commit: Update README.md
Repository: activemq-cli-tools Updated Branches: refs/heads/master 1504f9882 -> 9c03d340b Update README.md 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/9c03d340 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/9c03d340 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/9c03d340 Branch: refs/heads/master Commit: 9c03d340b64fc5bf781427f2ce3c953d392f6a92 Parents: 1504f98 Author: Christopher L. Shannon Authored: Mon May 1 14:20:04 2017 -0400 Committer: GitHub Committed: Mon May 1 14:20:04 2017 -0400 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c03d340/README.md -- diff --git a/README.md b/README.md index 5e0419d..cefaa36 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 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 using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html) +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 ```
activemq-cli-tools git commit: Update README.md
Repository: activemq-cli-tools Updated Branches: refs/heads/master 76563e567 -> 1504f9882 Update README.md 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/1504f988 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/1504f988 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/1504f988 Branch: refs/heads/master Commit: 1504f9882858389ee085822b62779585d8feb423 Parents: 76563e5 Author: Christopher L. Shannon Authored: Mon May 1 14:16:39 2017 -0400 Committer: GitHub Committed: Mon May 1 14:16:39 2017 -0400 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/1504f988/README.md -- diff --git a/README.md b/README.md index 7792542..5e0419d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 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## +## 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 using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html)
activemq-cli-tools git commit: Update README.md
Repository: activemq-cli-tools Updated Branches: refs/heads/master 068f87e52 -> 76563e567 Update README.md 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/76563e56 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/76563e56 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/76563e56 Branch: refs/heads/master Commit: 76563e5674114ab144b270429205dc2caa61c109 Parents: 068f87e Author: Christopher L. Shannon Authored: Mon May 1 14:15:36 2017 -0400 Committer: GitHub Committed: Mon May 1 14:15:36 2017 -0400 -- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/76563e56/README.md -- diff --git a/README.md b/README.md index c7359f5..7792542 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ useful for users of the ActiveMQ and ActiveMQ Artemis messaging brokers 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 using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html) -###Usage### +### Usage ``` $ ./bin/export help usage: export [] @@ -51,7 +51,7 @@ OPTIONS Topic Export Pattern ``` -###Examples:### +### Examples: Export entire store:
activemq-cli-tools git commit: NO-JIRA: Updating version to 0.2.0-SNAPSHOT
Repository: activemq-cli-tools Updated Branches: refs/heads/master bc69ab9e3 -> 068f87e52 NO-JIRA: Updating version to 0.2.0-SNAPSHOT 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/068f87e5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/068f87e5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/068f87e5 Branch: refs/heads/master Commit: 068f87e521c67d38a3ab2cc2122291e56e3c3cbd Parents: bc69ab9 Author: Christopher L. Shannon (cshannon) Authored: Mon May 1 14:13:48 2017 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 1 14:13:48 2017 -0400 -- activemq-kahadb-exporter/pom.xml | 2 +- assembly/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/activemq-kahadb-exporter/pom.xml -- diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml index 125d5a8..acd3dc2 100644 --- a/activemq-kahadb-exporter/pom.xml +++ b/activemq-kahadb-exporter/pom.xml @@ -19,7 +19,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.1-SNAPSHOT +0.2.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 760a3f8..1825a90 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -13,7 +13,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.1-SNAPSHOT +0.2.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/pom.xml -- diff --git a/pom.xml b/pom.xml index 80ed8e4..552e758 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.activemq activemq-cli-tools-parent - 0.1.1-SNAPSHOT + 0.2.0-SNAPSHOT pom ActiveMQ CLI Tools
[activemq-cli-tools] Git Push Summary
Repository: activemq-cli-tools Updated Branches: refs/heads/0.1.x [created] bc69ab9e3
activemq-cli-tools git commit: [maven-release-plugin] prepare for next development iteration
Repository: activemq-cli-tools Updated Branches: refs/heads/master 70c7f8be8 -> bc69ab9e3 [maven-release-plugin] prepare for next development iteration 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/bc69ab9e Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/bc69ab9e Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/bc69ab9e Branch: refs/heads/master Commit: bc69ab9e3ce73a0d3aa6a0e49055ff0b49a10821 Parents: 70c7f8b Author: Christopher L. Shannon (cshannon) Authored: Mon May 1 13:18:24 2017 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 1 13:18:24 2017 -0400 -- activemq-kahadb-exporter/pom.xml | 2 +- assembly/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/activemq-kahadb-exporter/pom.xml -- diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml index 6c1b777..125d5a8 100644 --- a/activemq-kahadb-exporter/pom.xml +++ b/activemq-kahadb-exporter/pom.xml @@ -19,7 +19,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.0 +0.1.1-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 63bb44a..760a3f8 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -13,7 +13,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.0 +0.1.1-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/pom.xml -- diff --git a/pom.xml b/pom.xml index 0119af3..80ed8e4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.activemq activemq-cli-tools-parent - 0.1.0 + 0.1.1-SNAPSHOT pom ActiveMQ CLI Tools @@ -56,7 +56,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git -0.1.0 +HEAD https://issues.apache.org/jira/browse/AMQCLI
[activemq-cli-tools] Git Push Summary
Repository: activemq-cli-tools Updated Tags: refs/tags/0.1.0 [created] 684b848ae
activemq-cli-tools git commit: [maven-release-plugin] prepare release 0.1.0
Repository: activemq-cli-tools Updated Branches: refs/heads/master b29778c20 -> 70c7f8be8 [maven-release-plugin] prepare release 0.1.0 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/70c7f8be Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/70c7f8be Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/70c7f8be Branch: refs/heads/master Commit: 70c7f8be826968cfcbd6d3499654f494baae Parents: b29778c Author: Christopher L. Shannon (cshannon) Authored: Mon May 1 13:18:02 2017 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 1 13:18:02 2017 -0400 -- activemq-kahadb-exporter/pom.xml | 5 ++--- assembly/pom.xml | 5 ++--- pom.xml | 7 +++ 3 files changed, 7 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/activemq-kahadb-exporter/pom.xml -- diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml index 2b884ee..6c1b777 100644 --- a/activemq-kahadb-exporter/pom.xml +++ b/activemq-kahadb-exporter/pom.xml @@ -15,12 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -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";> +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";> org.apache.activemq activemq-cli-tools-parent -0.1.0-SNAPSHOT +0.1.0 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 6c97782..63bb44a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -9,12 +9,11 @@ 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://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";> +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";> org.apache.activemq activemq-cli-tools-parent -0.1.0-SNAPSHOT +0.1.0 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/pom.xml -- diff --git a/pom.xml b/pom.xml index 94a4ba9..0119af3 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -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";> +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";> org.apache @@ -27,7 +26,7 @@ org.apache.activemq activemq-cli-tools-parent - 0.1.0-SNAPSHOT + 0.1.0 pom ActiveMQ CLI Tools @@ -57,7 +56,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git -HEAD +0.1.0 https://issues.apache.org/jira/browse/AMQCLI
[activemq-cli-tools] Git Push Summary
Repository: activemq-cli-tools Updated Tags: refs/tags/0.1.0 [deleted] 1486749e7
[2/2] activemq-cli-tools git commit: Revert "[maven-release-plugin] prepare release 0.1.0"
Revert "[maven-release-plugin] prepare release 0.1.0" This reverts commit e57e36854c6d1cd024519b64e982de9fbec5dbb6. 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/b29778c2 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/b29778c2 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/b29778c2 Branch: refs/heads/master Commit: b29778c2094a0124d84a25e36940d44eae5319c6 Parents: eca6a2c Author: Christopher L. Shannon (cshannon) Authored: Mon May 1 12:57:11 2017 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 1 12:57:11 2017 -0400 -- activemq-kahadb-exporter/pom.xml | 5 +++-- assembly/pom.xml | 5 +++-- pom.xml | 7 --- 3 files changed, 10 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/activemq-kahadb-exporter/pom.xml -- diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml index 6c1b777..2b884ee 100644 --- a/activemq-kahadb-exporter/pom.xml +++ b/activemq-kahadb-exporter/pom.xml @@ -15,11 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -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";> +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";> org.apache.activemq activemq-cli-tools-parent -0.1.0 +0.1.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 63bb44a..6c97782 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -9,11 +9,12 @@ 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://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";> +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";> org.apache.activemq activemq-cli-tools-parent -0.1.0 +0.1.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/pom.xml -- diff --git a/pom.xml b/pom.xml index 0119af3..94a4ba9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -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";> +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";> org.apache @@ -26,7 +27,7 @@ org.apache.activemq activemq-cli-tools-parent - 0.1.0 + 0.1.0-SNAPSHOT pom ActiveMQ CLI Tools @@ -56,7 +57,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git -0.1.0 +HEAD https://issues.apache.org/jira/browse/AMQCLI
[1/2] activemq-cli-tools git commit: Revert "[maven-release-plugin] prepare for next development iteration"
Repository: activemq-cli-tools Updated Branches: refs/heads/master 87576603b -> b29778c20 Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 87576603b153c0e896f202342f283cf9ba14f830. 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/eca6a2c7 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/eca6a2c7 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/eca6a2c7 Branch: refs/heads/master Commit: eca6a2c71720d18a853becec07e31813b95279b4 Parents: 8757660 Author: Christopher L. Shannon (cshannon) Authored: Mon May 1 12:57:00 2017 -0400 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 1 12:57:00 2017 -0400 -- activemq-kahadb-exporter/pom.xml | 2 +- assembly/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/activemq-kahadb-exporter/pom.xml -- diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml index 125d5a8..6c1b777 100644 --- a/activemq-kahadb-exporter/pom.xml +++ b/activemq-kahadb-exporter/pom.xml @@ -19,7 +19,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.1-SNAPSHOT +0.1.0 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 760a3f8..63bb44a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -13,7 +13,7 @@ org.apache.activemq activemq-cli-tools-parent -0.1.1-SNAPSHOT +0.1.0 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/pom.xml -- diff --git a/pom.xml b/pom.xml index 80ed8e4..0119af3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.activemq activemq-cli-tools-parent - 0.1.1-SNAPSHOT + 0.1.0 pom ActiveMQ CLI Tools @@ -56,7 +56,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git -HEAD +0.1.0 https://issues.apache.org/jira/browse/AMQCLI
[2/2] activemq-artemis git commit: This closes #1238
This closes #1238 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/938c7a1d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/938c7a1d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/938c7a1d Branch: refs/heads/master Commit: 938c7a1d9916c2bdb3f4c7bca0c103f579a6f0b6 Parents: 6df8c3a 2cdc625 Author: Clebert Suconic Authored: Mon May 1 10:09:34 2017 -0400 Committer: Clebert Suconic Committed: Mon May 1 10:09:34 2017 -0400 -- .../UnpooledUnsafeDirectByteBufWrapper.java | 288 --- 1 file changed, 250 insertions(+), 38 deletions(-) --
[1/2] activemq-artemis git commit: ARTEMIS-1136 Improve UnpooledUnsafeDirectByteBufWrapper
Repository: activemq-artemis
Updated Branches:
refs/heads/master 6df8c3a28 -> 938c7a1d9
ARTEMIS-1136 Improve UnpooledUnsafeDirectByteBufWrapper
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2cdc6257
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2cdc6257
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2cdc6257
Branch: refs/heads/master
Commit: 2cdc62572bb42de0f98d96e53fb47dc89012a30c
Parents: 6df8c3a
Author: Francesco Nigro
Authored: Sun Apr 30 08:11:41 2017 +0200
Committer: Clebert Suconic
Committed: Mon May 1 10:09:33 2017 -0400
--
.../UnpooledUnsafeDirectByteBufWrapper.java | 288 ---
1 file changed, 250 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2cdc6257/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
--
diff --git
a/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
b/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
index 0da33c6..a4346dc 100644
---
a/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
+++
b/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
import java.nio.channels.FileChannel;
import java.nio.channels.GatheringByteChannel;
import java.nio.channels.ScatteringByteChannel;
@@ -29,28 +30,59 @@ import java.nio.channels.ScatteringByteChannel;
import io.netty.util.internal.PlatformDependent;
/**
- * A NIO direct {@link ByteBuffer} wrapper.
- * Only ByteBuffer's manipulation operations are supported.
+ * A NIO {@link ByteBuffer}, byte[] and address direct access wrapper.
+ * Only content manipulation operations are supported.
* Is best suited only for encoding/decoding purposes.
*/
public final class UnpooledUnsafeDirectByteBufWrapper extends
AbstractReferenceCountedByteBuf {
private ByteBuffer buffer;
+ private int arrayOffset;
+ private byte[] array;
private long memoryAddress;
- /**
-* Creates a new direct buffer by wrapping the specified initial buffer.
-*/
public UnpooledUnsafeDirectByteBufWrapper() {
super(0);
this.buffer = null;
+ this.arrayOffset = -1;
+ this.array = null;
this.memoryAddress = 0L;
}
+ public void wrap(long address, int length) {
+ this.memoryAddress = address;
+ this.arrayOffset = -1;
+ this.array = null;
+ this.buffer = null;
+ clear();
+ maxCapacity(length);
+ }
+
+ public void wrap(byte[] array, int srcIndex, int length) {
+ if (array != null) {
+ this.memoryAddress = 0L;
+ this.arrayOffset = srcIndex;
+ this.array = array;
+ this.buffer = null;
+ clear();
+ maxCapacity(length);
+ } else {
+ reset();
+ }
+ }
+
public void wrap(ByteBuffer buffer, int srcIndex, int length) {
if (buffer != null) {
this.buffer = buffer;
- this.memoryAddress = PlatformDependent.directBufferAddress(buffer) +
srcIndex;
+ if (buffer.isDirect()) {
+this.memoryAddress = PlatformDependent.directBufferAddress(buffer)
+ srcIndex;
+this.arrayOffset = -1;
+this.array = null;
+ } else {
+this.arrayOffset = srcIndex;
+this.array = buffer.array();
+this.memoryAddress = 0L;
+ }
clear();
maxCapacity(length);
} else {
@@ -61,13 +93,15 @@ public final class UnpooledUnsafeDirectByteBufWrapper
extends AbstractReferenceC
public void reset() {
this.buffer = null;
this.memoryAddress = 0L;
+ this.arrayOffset = -1;
+ this.array = null;
clear();
maxCapacity(0);
}
@Override
public boolean isDirect() {
- return true;
+ return buffer != null ? buffer.isDirect() : false;
}
@Override
@@ -95,22 +129,22 @@ public final class UnpooledUnsafeDirectByteBufWrapper
extends AbstractReferenceC
@Override
public boolean hasArray() {
- return false;
+ return array != null;
}
@Override
public byte[] array() {
- throw new UnsupportedOperationException("direct buffer");
+ return array;
}
@Override
public int arrayOffset() {
- throw new UnsupportedOperationException("direct buffer");
+ return arrayOffset;
}
@Override
public boolean hasMemoryAddress() {
- return true
activemq-artemis git commit: Revert " ARTEMIS-1112: don't block live activation if another live server is running"
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7f70e4b6f -> 6df8c3a28
Revert " ARTEMIS-1112: don't block live activation if another live server is
running"
This reverts commit 2f175b8d4ef00fe3b9a6388cc4beab7fa22461c1.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6df8c3a2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6df8c3a2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6df8c3a2
Branch: refs/heads/master
Commit: 6df8c3a28d113063c89da06f0875d18cead0cd56
Parents: 7f70e4b
Author: Clebert Suconic
Authored: Mon May 1 09:50:45 2017 -0400
Committer: Clebert Suconic
Committed: Mon May 1 09:50:45 2017 -0400
--
.../server/impl/SharedStoreLiveActivation.java | 26 +++--
.../SharedStoreLiveStartsAsBackupTest.java | 104 ---
2 files changed, 12 insertions(+), 118 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6df8c3a2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
index 52e656f..485ae16 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.core.server.impl;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.NodeManager;
import
org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy;
-import
org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy;
import org.jboss.logging.Logger;
public final class SharedStoreLiveActivation extends LiveActivation {
@@ -39,19 +38,6 @@ public final class SharedStoreLiveActivation extends
LiveActivation {
@Override
public void run() {
try {
- if (activeMQServer.getNodeManager().isBackupLive()) {
-/*
- * looks like there is already a live server running and we should
start as backup server
- * so when the current live goes down they failover to us
- */
-if (logger.isDebugEnabled()) {
- logger.debug("announcing backup to the former live " + this);
-}
-
-activeMQServer.setHAPolicy(new
SharedStoreSlavePolicy(sharedStoreMasterPolicy.isFailoverOnServerShutdown(),
false, false, null));
-return;
- }
-
ActiveMQServerLogger.LOGGER.awaitingLiveLock();
activeMQServer.checkJournalDirectory();
@@ -63,6 +49,18 @@ public final class SharedStoreLiveActivation extends
LiveActivation {
if (!activeMQServer.initialisePart1(false))
return;
+ if (activeMQServer.getNodeManager().isBackupLive()) {
+/*
+ * looks like we've failed over at some point need to inform that
we are the backup
+ * so when the current live goes down they failover to us
+ */
+if (logger.isDebugEnabled()) {
+ logger.debug("announcing backup to the former live" + this);
+}
+activeMQServer.getBackupManager().start();
+activeMQServer.getBackupManager().announceBackup();
+ }
+
activeMQServer.registerActivateCallback(activeMQServer.getNodeManager().startLiveNode());
if (activeMQServer.getState() ==
ActiveMQServerImpl.SERVER_STATE.STOPPED || activeMQServer.getState() ==
ActiveMQServerImpl.SERVER_STATE.STOPPING) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6df8c3a2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreLiveStartsAsBackupTest.java
--
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreLiveStartsAsBackupTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreLiveStartsAsBackupTest.java
deleted file mode 100644
index 24bdff3..000
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreLiveStartsAsBackupTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one o
