from:"chirino"

Hiram Chirino created a page:

Apache ActiveMQ Board Report - 2015.04 (April)

TLP Description:Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.
Community:* The development and user lists continue to stay active. * Apache board membersrequesteda special report to address what the plan is of the hornetq codedonation. There were some specific question what were directed at the PMC:
Q. RH has a product, called HornetQ, which includes a website; branding, etc.http://hornetq.jboss.org/ A. ActiveMQ PMC does not intend to use the HornetQ branding in any code, docs or website. The code donation has been updated to remove such references. Q. The ActiveMQ PMC needs to deliver a plan for: A. 1. Apache ActiveMQ has multiple products with multiple versions: a. ActiveMQ - (version 5.x.x) b. ${codename} - (version 1.x.x)Q. The current chair has been the chair for *many* years and based on the currentstatus and issues in the community, I would strongly suggest having a plan for potentially replacing the chair of the project.
A. The PMC agrees.

* The PMC has voted to give the code donation a code name so that it is not referred to as HornetQ anymore within ActiveMQ.
* PMC has voted to appoint Bruce Snyder as the ActiveMQ PMC chair. The PMC requests that the board approve the the following resolution:
--
WHEREAS, the Board of Directors heretofore appointed Hiram Chirino to the office of Vice President, Apache ActiveMQ, and WHEREAS, the Board of Directors is in receipt of the resignation of Hiram Chirino from the office of Vice President, Apache ActiveMQ, and WHEREAS, the Project Management Committee of the Apache ActiveMQ project has chosen by vote to recommend Bruce Snyder as the Successor to the post; NOW, THEREFORE, BE IT RESOLVED, that Hiram Chirino is relieved and discharged from the duties and responsibilities of the office of Vice President, Apache ActiveMQ, and BE IT FURTHER RESOLVED, that Bruce Snyder be and hereby is appointed to the office of Vice President, Apache ActiveMQ, to serve in accordance with and subject to the direction of the Board of Directors and the Bylaws of the Foundation until death, resignation, retirement, removal or disqualification, or until a successor is appointed.
--
Development:* Development on ActiveMQ 5.12 is in progress.* Development on ActiveMQ ${codename} is in progress.
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases:

View Online Like
Stop watching space Manage Notifications

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - 2015.04 (April)   






...
 * The PMC has voted to give the code donation a code name so that it is not referred to as HornetQ anymore within ActiveMQ.* IP clearance for the code donation is almost complete:http://incubator.apache.org/ip-clearance/hornetq.html  * PMC has voted to appoint Bruce Snyder as the ActiveMQ PMC chair. The PMC requests that the board approve the the following resolution: 
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - 2015.04 (April)   






...
Community:* The development and user lists continue to stay active. * Several ActiveMQ based presentation were given at Apachecon NA.  * Apache board membersrequesteda special report to address what the plan is of the hornetq codedonation. There were some specific question what were directed at the PMC: 
   Q. RH has a product, called HornetQ, which includes a website;  branding, etc.http://hornetq.jboss.org/ A. ActiveMQ PMC does not intend to use the HornetQ branding in any code,  docs or website. The code donation has been updated to remove such  references. Q. The ActiveMQ PMC needs to deliver a plan for:   A. 1. Apache ActiveMQ has multiple products with multiple versions: a. ActiveMQ - (version 5.x.x) b. ${codename} - (version 1.x.x)Q. The current chair has been the chair for *many* years and based on the currentstatus and issues in the community, I would strongly suggest having a plan for potentially replacing the chair of the project. 
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - 2015.04 (April)   






...
 * The PMC has voted to give the code donation a code name so that it is not referred to as HornetQ anymore within ActiveMQ.* IP clearance for the code donation is almost complete:http://incubator.apache.org/ip-clearance/hornetq.html * PMC is in discussions looking for ways to increase community diversity  * PMC has voted to appoint Bruce Snyder as the ActiveMQ PMC chair. The PMC requests that the board approve the the following resolution: 
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - 2015.04 (April)   






...
   Q. Red Hat has a product, called HornetQ, which includes a website;  branding, etc.http://hornetq.jboss.org/ A. ActiveMQ PMC does not intend to use the HornetQ branding in any code,  docs or website. The code donation has been updated to remove such  references.TheHornetQ open source project is now considered a legacy  project and the code is no longer maintained as the open source project HornetQ.The ActiveMQ community is beginning to work together to develop a plan to take the donated code base forward and to develop  communityaround this code base. Q. The ActiveMQ PMC needs to deliver a plan for:   A.  1. Apache Apache ActiveMQ has multiple products with multiple versions: a. ActiveMQ - (version 5.x.x) b.  ActiveMQ ${codename} - (version 1.x.x) 
  This means that we are not yet ready to declare thatActiveMQ ${codename} is the successor to ActiveMQ 5.x. We will wait until the product matures to make that decision.Q. The current chair has been the chair for *many* years and based on the currentstatus and issues in the community, I would strongly suggest having a plan for potentially replacing the chair of the project. 
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - 2015.04 (April)   




 Comment: added release done in the period 


...
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases: *Apache ActiveMQ 5.11.1 - 2/17/15  *Apache ActiveMQ 5.10.2 - 2/17/15  * Apache ActiveMQ-CPP v3.8.4 - 2/19/15 
  

  

  
  






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.04 (April)

Hiram Chirino edited the page:

Apache ActiveMQ Board Report - 2015.04 (April)

...
Community:* The development and user lists continue to stay active.* Several ActiveMQ based presentation were given at Apachecon NA. * The ActiveMQ community has voted to name the HortnetQ code donation ActiveMQArtemis. * Apache board membersrequesteda special report to address what the plan is of the hornetq codedonation. There were some specific question what were directed at the PMC:
Q. Red Hat has a product, called HornetQ, which includes a website; branding, etc.http://hornetq.jboss.org/ A. ActiveMQ PMC does not intend to use the HornetQ branding in any code, docs or website. The code donation has been updated to remove such references.TheHornetQ open source project is now considered a legacy project and the code is no longer maintained as the open source project HornetQ.The ActiveMQ community is beginning to work together to develop a plan to take the donated code base forward and to develop communityaround this code base. Q. The ActiveMQ PMC needs to deliver a plan for: A. Apache ActiveMQ has multiple products with multiple versions: a. ActiveMQ - (version 5.x.x) b. ActiveMQ ${codename} Artemis- (version 1.x.x)
This means that we are not yet ready to declare thatActiveMQ ${codename} is Artemisis the successor to ActiveMQ 5.x. We will wait until the product matures to make that decision.Q. The current chair has been the chair for *many* years and based on the currentstatus and issues in the community, I would strongly suggest having a plan for potentially replacing the chair of the project.
...
Development:* Development on ActiveMQ 5.12 is in progress.* Development on ActiveMQ ${codename} is Artemisis in progress.
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
...

View Online Like View Changes
Stop watching space Manage Notifications

This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

activemq-6 git commit: Setting posix permissions is not supported on windows. Use a boot jar to setup the classpath.

2015-04-16 Thread chirino

Repository: activemq-6
Updated Branches:
  refs/heads/master a1bdb3c02 - 3b82dc52e


Setting posix permissions is not supported on windows.
Use a boot jar to setup the classpath.


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/3b82dc52
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/3b82dc52
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/3b82dc52

Branch: refs/heads/master
Commit: 3b82dc52ed8ddc4d2c42eff21ee20d6519edb8b8
Parents: a1bdb3c
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Wed Apr 15 19:55:28 2015 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Apr 16 22:10:35 2015 -0400

--
 activemq-boot/pom.xml   |  46 +++
 .../java/org/apache/activemq/boot/ActiveMQ.java | 136 +++
 .../java/org/apache/activemq/cli/ActiveMQ.java  |   1 -
 .../apache/activemq/cli/commands/Create.java|  27 ++--
 .../org/apache/activemq/cli/commands/Run.java   |  17 ++-
 .../activemq/factory/BasicSecurityHandler.java  |  18 ++-
 .../apache/activemq/factory/BrokerFactory.java  |  22 ++-
 .../apache/activemq/cli/commands/bin/activemq   |  42 +++---
 .../activemq/cli/commands/bin/activemq.cmd  |  20 +--
 .../apache/activemq/cli/commands/bin/run.bat|  17 ---
 .../org/apache/activemq/cli/commands/bin/run.sh |  19 ---
 .../apache/activemq/cli/commands/bin/stop.bat   |  17 ---
 .../apache/activemq/cli/commands/bin/stop.sh|  19 ---
 .../cli/commands/etc/activemq.profile.cmd   |  16 +--
 distribution/activemq/pom.xml   |   5 +
 distribution/activemq/src/main/assembly/dep.xml |  17 +++
 .../activemq/src/main/resources/bin/activemq|  32 +++--
 .../src/main/resources/bin/activemq.cmd |  23 +---
 pom.xml |   1 +
 19 files changed, 322 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/3b82dc52/activemq-boot/pom.xml
--
diff --git a/activemq-boot/pom.xml b/activemq-boot/pom.xml
new file mode 100644
index 000..bd931d0
--- /dev/null
+++ b/activemq-boot/pom.xml
@@ -0,0 +1,46 @@
+?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.
+--
+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;
+
+   modelVersion4.0.0/modelVersion
+
+   parent
+  groupIdorg.apache.activemq/groupId
+  artifactIdactivemq-pom/artifactId
+  version10.0.0-SNAPSHOT/version
+  relativePath../relativePath
+   /parent
+
+   artifactIdactivemq-boot/artifactId
+   packagingjar/packaging
+   nameActiveMQ6 Boot/name
+
+   properties
+  activemq.basedir${project.basedir}/../activemq.basedir
+   /properties
+
+   dependencies
+  dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ scopetest/scope
+  /dependency
+   /dependencies
+
+/project

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/3b82dc52/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java
--
diff --git a/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java 
b/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java
new file mode 100644
index 000..afe965f
--- /dev/null
+++ b/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java
@@ -0,0 +1,136 @@
+/**
+ * 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

activemq-apollo git commit: fix web administration console message truncate bug APLO-362

2015-04-14 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 60489d13a - fd298b7ad


fix web administration console message truncate bug APLO-362


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/fd298b7a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/fd298b7a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/fd298b7a

Branch: refs/heads/trunk
Commit: fd298b7ad96c97a672bae17f6654de663652ed9b
Parents: 60489d1
Author: Shani Elharrar atnt...@bezeqint.net
Authored: Tue Apr 14 21:43:24 2015 +0300
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Tue Apr 14 16:17:53 2015 -0400

--
 .../org/apache/activemq/apollo/web/resources/BrokerResource.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/fd298b7a/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
--
diff --git 
a/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
 
b/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
index d3c1750..b8969cd 100644
--- 
a/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
+++ 
b/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
@@ -760,7 +760,7 @@ class BrokerResource() extends Resource {
 rc.entry = entry
 
 if( max_body  0 ) {
-  val body = delivery.message.getBodyAs(classOf[Buffer])
+  val body = new Buffer(delivery.message.getBodyAs(classOf[Buffer]))
   if( body.length  max_body) {
 body.length = max_body
 rc.body_truncated = true

[jira] [Resolved] (APLO-362) Retained message gets shortened

2015-04-14 Thread Hiram Chirino (JIRA)


 [ 
https://issues.apache.org/jira/browse/APLO-362?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino resolved APLO-362.

   Resolution: Fixed
Fix Version/s: 1.8
 Assignee: Hiram Chirino

 Retained message gets shortened
 ---

 Key: APLO-362
 URL: https://issues.apache.org/jira/browse/APLO-362
 Project: ActiveMQ Apollo
  Issue Type: Bug
Affects Versions: 1.7
 Environment: Used Windows 7 and Chrome for web interface 
 Broker is on Linux 2.6.32-431.20.3.el6.x86_64 and Java HotSpot(TM) 64-Bit 
 Server VM 1.8.0_05 (Oracle Corporation)
Reporter: Lukas Greblikas
Assignee: Hiram Chirino
Priority: Minor
  Labels: mqtt, retained
 Fix For: 1.8


 Retained MQTT message  gets shortened and stays shortened after you go topic 
 (where message is sent/retained) page on apollo web interface. 
 Example:
 I send long retained message to test topic. I restart my scripts which 
 subscribes to test topic and all is working fine. Now let's say I got to 
 appollo web interface-- topics --test. After I open the mentioned page 
 retained message becomes shortened. If I restart my scripts which subscribes 
 to test topic now they get only the shortened message. Shortened message 
 size is exactly the same as shown in web interface when you press on that 
 message. 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (APLO-375) Update source code repository location

2015-04-09 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-375?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14488151#comment-14488151
 ] 

Hiram Chirino commented on APLO-375:


please attach patch.

 Update source code repository location
 --

 Key: APLO-375
 URL: https://issues.apache.org/jira/browse/APLO-375
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-website
Affects Versions: 1.7
Reporter: Marko Asplund

 Apollo source code seems to have moved over from
 http://svn.apache.org/repos/asf/activemq/activemq-apollo
 to
 git://git.apache.org/activemq-apollo.git
 The website still refers to the old source code repository e.g. here:
 http://activemq.apache.org/apollo/community/source.html



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Commented] (APLO-373) Apollo service fails to stop properly with purge_on_startup=true

2015-04-09 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-373?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14488156#comment-14488156
 ] 

Hiram Chirino commented on APLO-373:


Please attach patch with your fix. thx!

 Apollo service fails to stop properly with purge_on_startup=true
 --

 Key: APLO-373
 URL: https://issues.apache.org/jira/browse/APLO-373
 Project: ActiveMQ Apollo
  Issue Type: Bug
Reporter: Andrew Lin

 Steps to reproduce:
   * Set up a broker with the purge_on_startup option set to true
   * Use apollo-broker-service start to start the broker
   * Use apollo-broker-service stop
 Expected behavior: apollo process is stopped
 Observed behavior: apollo process is not stopped
 I'm pretty sure the problem is that the service script puts its pidfile in 
 the data directory, which is purged by apollo on startup.  Hacking the script 
 to put the pidfile outside the data directory does solve my problem.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Comment Edited] (APLO-373) Apollo service fails to stop properly with purge_on_startup=true

2015-04-09 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-373?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14488156#comment-14488156
 ] 

Hiram Chirino edited comment on APLO-373 at 4/9/15 8:06 PM:


Perhaps the broker should know not to delete the pid files tho.


was (Author: chirino):
Please attach patch with your fix. thx!

 Apollo service fails to stop properly with purge_on_startup=true
 --

 Key: APLO-373
 URL: https://issues.apache.org/jira/browse/APLO-373
 Project: ActiveMQ Apollo
  Issue Type: Bug
Reporter: Andrew Lin

 Steps to reproduce:
   * Set up a broker with the purge_on_startup option set to true
   * Use apollo-broker-service start to start the broker
   * Use apollo-broker-service stop
 Expected behavior: apollo process is stopped
 Observed behavior: apollo process is not stopped
 I'm pretty sure the problem is that the service script puts its pidfile in 
 the data directory, which is purged by apollo on startup.  Hacking the script 
 to put the pidfile outside the data directory does solve my problem.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

activemq git commit: Fix for AMQ-5652: IdGenerator not optimal in port restricted environments.

2015-03-09 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/master b9b566918 - 638c1e44b


Fix for AMQ-5652: IdGenerator not optimal in port restricted environments.

We now support configuring via system props activemq.idgenerator.hostname and 
activemq.idgenerator.localport which are used as the base part of GUIDs.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/638c1e44
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/638c1e44
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/638c1e44

Branch: refs/heads/master
Commit: 638c1e44b15f425d71e2c203c43ca104b8a9a16e
Parents: b9b5669
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Mar 9 13:54:42 2015 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Mar 9 13:54:52 2015 -0400

--
 .../src/main/java/org/apache/activemq/util/IdGenerator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/638c1e44/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java 
b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
index 071a35e..0b29416 100755
--- a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
@@ -59,7 +59,7 @@ public class IdGenerator {
 int idGeneratorPort = 0;
 ServerSocket ss = null;
 try {
-if( hostName!=null ) {
+if( hostName==null ) {
 hostName = InetAddressUtil.getLocalHostName();
 }
 if( localPort==0 ) {

activemq git commit: Fix for AMQ-5652: IdGenerator not optimal in port restricted environments.

2015-03-09 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/master 1c72579d7 - e25a6aa8a


Fix for AMQ-5652: IdGenerator not optimal in port restricted environments.

We now support configuring via system props activemq.idgenerator.hostname and 
activemq.idgenerator.localport which are used as the base part of GUIDs.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e25a6aa8
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e25a6aa8
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e25a6aa8

Branch: refs/heads/master
Commit: e25a6aa8a18fbd1e0ada5bfa2b5655b80b053b9e
Parents: 1c72579
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Mar 9 13:45:20 2015 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Mar 9 13:50:04 2015 -0400

--
 .../org/apache/activemq/util/IdGenerator.java   | 25 +++-
 1 file changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e25a6aa8/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java 
b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
index 3bf10a5..071a35e 100755
--- a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
@@ -35,6 +35,8 @@ public class IdGenerator {
 private String seed;
 private final AtomicLong sequence = new AtomicLong(1);
 private int length;
+public static final String PROPERTY_IDGENERATOR_HOSTNAME 
=activemq.idgenerator.hostname;
+public static final String PROPERTY_IDGENERATOR_LOCALPORT 
=activemq.idgenerator.localport;
 public static final String PROPERTY_IDGENERATOR_PORT 
=activemq.idgenerator.port;
 
 static {
@@ -50,15 +52,26 @@ public class IdGenerator {
 }
 
 if (canAccessSystemProps) {
+
+hostName = System.getProperty(PROPERTY_IDGENERATOR_HOSTNAME);
+int localPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_LOCALPORT, 0));
+
 int idGeneratorPort = 0;
 ServerSocket ss = null;
 try {
-idGeneratorPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, 0));
-LOG.trace(Using port {}, idGeneratorPort);
-hostName = InetAddressUtil.getLocalHostName();
-ss = new ServerSocket(idGeneratorPort);
-stub = - + ss.getLocalPort() + - + 
System.currentTimeMillis() + -;
-Thread.sleep(100);
+if( hostName!=null ) {
+hostName = InetAddressUtil.getLocalHostName();
+}
+if( localPort==0 ) {
+idGeneratorPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, 0));
+LOG.trace(Using port {}, idGeneratorPort);
+ss = new ServerSocket(idGeneratorPort);
+localPort = ss.getLocalPort();
+stub = - + localPort + - + System.currentTimeMillis() 
+ -;
+Thread.sleep(100);
+} else {
+stub = - + localPort + - + System.currentTimeMillis() 
+ -;
+}
 } catch (Exception e) {
 if (LOG.isTraceEnabled()) {
 LOG.trace(could not generate unique stub by using DNS and 
binding to local port, e);

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - February 2015

2015-02-10 Thread Hiram Chirino (Confluence)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - February 2015   






...
Community:* The development and user lists continue to stay active.* Robbie Gemmell became a committer 12/9/14* Emeritus PMC members removed. * Arthur Naseef joined the ActiveMQ PMC  * Dan Kulp joined the ActiveMQ PMC  
Development: * trunk branch renamed to master to follow git naming conventions.  * Development on ActiveMQ 5.11 is in progress.  * Development on ActiveMQ 6.0 is in progress. 
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases:* Apache.NMS 1.7.0 - 1/8/15 * Apache.NMS.ActiveMQ 1.7.0 - 1/16/15  * Apache ActiveMQ 5.10.1 - 1/20/15  *Apache ActiveMQ 5.11.0 - 2/3/15  * Apache Apollo 1.7.1 - 2/3/15 






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

svn commit: r7927 - in /release/activemq/activemq-apollo: 1.7.1/ 1.7/

2015-02-03 Thread chirino

Author: chirino
Date: Tue Feb  3 16:28:15 2015
New Revision: 7927

Log:
Adding the ActiveMQ Apollo 1.7.1 release

Added:
release/activemq/activemq-apollo/1.7.1/

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz   
(with props)

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.asc

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.md5

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.sha1

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip   
(with props)

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.asc

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.md5

release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.sha1

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.tar.gz
   (with props)

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.tar.gz.asc

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.tar.gz.md5

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.tar.gz.sha1

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.zip  
 (with props)

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.zip.asc

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.zip.md5

release/activemq/activemq-apollo/1.7.1/apollo-project-1.7.1-source-release.zip.sha1
Removed:
release/activemq/activemq-apollo/1.7/

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz
==
Binary file - no diff available.

Propchange: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.asc
==
--- 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.asc
 (added)
+++ 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.asc
 Tue Feb  3 16:28:15 2015
@@ -0,0 +1,8 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlTKV+AACgkQn/JZgPW6fk+kSgCglc59Cy384eqGsET5CCcrVmQZ
+/2oAoK2dI5ZbjzC+LpOP9/e2iPUXEv+x
+=8Bf7
+-END PGP SIGNATURE-

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.md5
==
--- 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.md5
 (added)
+++ 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.md5
 Tue Feb  3 16:28:15 2015
@@ -0,0 +1 @@
+ae189e7aa90a12dffd5f9e4da3f11275
\ No newline at end of file

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.sha1
==
--- 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.sha1
 (added)
+++ 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz.sha1
 Tue Feb  3 16:28:15 2015
@@ -0,0 +1 @@
+5f9921042cc3167e48f54588f30da59f557f5a5a
\ No newline at end of file

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip
==
Binary file - no diff available.

Propchange: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip
--
svn:mime-type = application/octet-stream

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.asc
==
--- 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.asc
 (added)
+++ 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.asc
 Tue Feb  3 16:28:15 2015
@@ -0,0 +1,8 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEABECAAYFAlTKV+AACgkQn/JZgPW6fk90wwCfSmqDkkqEcEEN3A7Srq9SwFYb
+8RUAn2k6X61W/B2y1KfvVo2pw+syLKBG
+=fJvX
+-END PGP SIGNATURE-

Added: 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.md5
==
--- 
release/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-windows-distro.zip.md5
 (added

svn commit: r938823 - in /websites/production/activemq/content/apollo: ./ blog/ blog/releases/ community/ documentation/ documentation/api/apollo-broker/ documentation/api/apollo-broker/META-INF/ docu

2015-02-03 Thread chirino

Author: chirino
Date: Tue Feb  3 17:13:08 2015
New Revision: 938823

Log:
Deploy the apollo 1.7.1 website 



[This commit notification would consist of 277 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - February 2015

2015-02-02 Thread Hiram Chirino (Confluence)















  


Hiram Chirino created a page:
 


Apache ActiveMQ Board Report - February 2015   





TLP Description:Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.
 Community:* The development and user lists continue to stay active.
Development:  
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
 Releases:  





 View Online   Like  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - February 2015

2015-02-02 Thread Hiram Chirino (Confluence)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - February 2015   






...
Community:* The development and user lists continue to stay active. * Robbie Gemmell became a committer 12/9/14  * Emeritus PMC members removed. 
Development: * Development on ActiveMQ 5.11 is in progress.  * Development on ActiveMQ 6.0 is in progress. 
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases: * Apache.NMS 1.7.0 - 1/8/15  * Apache ActiveMQ 5.10.1 - 1/20/15 






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[1/2] activemq-apollo git commit: Update website links to point at next version.

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 1562336a1 - 413d172eb


Update website links to point at next version.


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/8bee1ef3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/8bee1ef3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/8bee1ef3

Branch: refs/heads/trunk
Commit: 8bee1ef37f9b9ca3d0978c1cf2354f74daf09c2f
Parents: 1562336
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 09:36:38 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 09:57:19 2015 -0500

--
 apollo-website/ext/Website.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/8bee1ef3/apollo-website/ext/Website.scala
--
diff --git a/apollo-website/ext/Website.scala b/apollo-website/ext/Website.scala
index 418a7e7..fd20e2d 100644
--- a/apollo-website/ext/Website.scala
+++ b/apollo-website/ext/Website.scala
@@ -34,10 +34,11 @@ object Website {
   val project_forums_url= 
http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html;
   val project_wiki_url= 
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Index;
   val project_logo= /images/project-logo.png
-  val project_version= 1.7
+  val project_version= 1.7.1
   val project_snapshot_version= 99-trunk-SNAPSHOT
   val project_versions = List(
 project_version,
+1.7,
 1.6,
 1.5,
 1.4,

[2/2] activemq-apollo git commit: Don't push change to the remote repo on release.

2015-01-29 Thread chirino

Don't push change to the remote repo on release.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/413d172e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/413d172e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/413d172e

Branch: refs/heads/trunk
Commit: 413d172ebc39a35d2ca709111f6de8407d6fa701
Parents: 8bee1ef
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:02:33 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:02:33 2015 -0500

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/413d172e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index eb25dc3..5fa6a1f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,7 @@
 goalsdeploy/goals
 remoteTaggingfalse/remoteTagging
 suppressCommitBeforeTagfalse/suppressCommitBeforeTag
+pushChangesfalse/pushChanges
   /configuration
   dependencies
 dependency

[1/3] activemq-apollo git commit: [maven-release-plugin] prepare release apollo-project-1.7.1

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 413d172eb - 7698cdb94


[maven-release-plugin] prepare release apollo-project-1.7.1


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/e67ee4f7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/e67ee4f7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/e67ee4f7

Branch: refs/heads/trunk
Commit: e67ee4f78c9cc1de0332450fb68cfde70132fdf4
Parents: 413d172
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:12:20 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:12:20 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 112 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e67ee4f7/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 8fc1283..6197f4f 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e67ee4f7/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 06ab8f2..387124b 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo

[3/3] activemq-apollo git commit: don't try to automatically deploy the website on release.

2015-01-29 Thread chirino

don't try to automatically deploy the website on release.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/7698cdb9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/7698cdb9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/7698cdb9

Branch: refs/heads/trunk
Commit: 7698cdb94d90e6a9db8a8add7f3a738f86ba2079
Parents: a36e96e
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:25:02 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:25:02 2015 -0500

--
 apollo-website/pom.xml | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/7698cdb9/apollo-website/pom.xml
--
diff --git a/apollo-website/pom.xml b/apollo-website/pom.xml
index c107ba5..1d0b86f 100644
--- a/apollo-website/pom.xml
+++ b/apollo-website/pom.xml
@@ -290,18 +290,12 @@
 
 profile
   iddeploy-website/id
-  activation
-property
-  namejava.vm.name/name
-/property
-  /activation
   build
 plugins
   plugin
 groupIdorg.fusesource.scalate/groupId
 artifactIdmaven-scalate-plugin_2.10/artifactId
 version${scalate-version}/version
-
 executions
   execution
 iddeploy/id

[2/3] activemq-apollo git commit: [maven-release-plugin] prepare for next development iteration

2015-01-29 Thread chirino

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/a36e96ee
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/a36e96ee
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/a36e96ee

Branch: refs/heads/trunk
Commit: a36e96eeea8cc44aa462a4df307842fe89e87a89
Parents: e67ee4f
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:12:30 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:12:30 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 112 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/a36e96ee/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 6197f4f..8fc1283 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/a36e96ee/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 387124b..06ab8f2 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version

activemq-apollo git commit: Applying matthewkmayer's patch: A quick pass at fixing up some typos in the docs.

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk e5647554e - c8d08cc87


Applying matthewkmayer's patch: A quick pass at fixing up some typos in the 
docs.


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/c8d08cc8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/c8d08cc8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/c8d08cc8

Branch: refs/heads/trunk
Commit: c8d08cc87a6a0c7a7baa7cbf7c7e3fc461ff6f54
Parents: e564755
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 08:06:33 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 08:06:33 2015 -0500

--
 apollo-website/src/documentation/user-manual.md | 50 ++--
 readme.md   |  4 +-
 2 files changed, 27 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c8d08cc8/apollo-website/src/documentation/user-manual.md
--
diff --git a/apollo-website/src/documentation/user-manual.md 
b/apollo-website/src/documentation/user-manual.md
index c38d9ba..9a7c3e3 100644
--- a/apollo-website/src/documentation/user-manual.md
+++ b/apollo-website/src/documentation/user-manual.md
@@ -84,7 +84,7 @@ unix script.
 ### Understanding the `apollo.xml` File
 
 There are many XSD aware XML editors which make editing XML configuration
-files less error prone.  If your using one of these editors, you can
+files less error prone.  If you're using one of these editors, you can
 configure it to use this [apollo.xsd](schema/apollo.xsd) file.
 
 The simplest valid `apollo.xml` defines a single virtual host and a
@@ -184,7 +184,7 @@ use the following configuration:
 /connector
 {pygmentize}
 
-If your using the `any` protocol then actual protocol being used will be
+If you're using the `any` protocol then actual protocol being used will be
 detected by examining the client's initial request. You can use the
 `detect` element within a `connector` element to configure the protocol
 detection settings.  The `detect` element supports the following 
@@ -289,7 +289,7 @@ origin policy, so by default you can access only brokers 
running on the same hos
 where the web page originated from.
 
 If you want to allow cross origin resource sharing (CORS) of the WebSocket 
connector,
-by different hosts then your should add `cors_origin` query parameter to the 
bind URI with 
+by different hosts then you should add `cors_origin` query parameter to the 
bind URI with 
 a common seperated list of domains that are allowed to access the WebSocket
 connector.  Use `*` to allow access from any domain.  Example:
 
@@ -353,11 +353,11 @@ The supported protocols that can be used with the udp 
transport are:
  Virtual Hosts
 
 A virtual hosts allows ${project_name} to support multi tenant style
-configurations. Each virtual host is highly isolated each with it's own
+configurations. Each virtual host is highly isolated each with its own
 persistence, security, and runtime constraints configuration.
 
 Protocols like STOMP 1.1, inform the broker of which host the client is
-attempting to connect with. The broker will search it's list of virtual hosts
+attempting to connect with. The broker will search its list of virtual hosts
 to find the first host who has a configured `host_name` that matches.
 Protocols which do NOT support virtual hosts, will just connect to the first
 virtual host defined in the configuration file.
@@ -383,7 +383,7 @@ configuration element to enable message persistence on the 
virtual host.
 
 # Queues
 
-When a new queue is first created in the broker, it's configuration will be
+When a new queue is first created in the broker, its configuration will be
 determined by the first `queue` element which matches the queue being
 created. The attributes matched against are:
 
@@ -406,7 +406,7 @@ A `queue` element may be configured with the following 
attributes:
   freshly enqueued message.  Defaults to `640k`.
 
 * `persistent` : If set to false, then the queue will not persistently
-  store it's message.  Defaults to true.
+  store its message.  Defaults to true.
 
 * `message_group_graceful_handoff` : When set to true, the queue
   will drain message group consumers of messages before
@@ -480,7 +480,7 @@ A `queue` element may be configured with the following 
attributes:
   
   If the queue is persistent then it is considered full when the max
   quota size is reached.  If the queue is not persistent then
-  the queue is considered full once it's `tail_buffer` fills up.
+  the queue is considered full once its `tail_buffer` fills up.
   Defaults to 'block' if not specified.
 
 Example configuraiton:
@@ -498,7 +498,7

[2/2] activemq-apollo git commit: [maven-release-plugin] prepare release apollo-project-apollo-project-1.7.1

2015-01-29 Thread chirino

[maven-release-plugin] prepare release apollo-project-apollo-project-1.7.1


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/57f01301
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/57f01301
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/57f01301

Branch: refs/heads/trunk
Commit: 57f013017f4d3b7dfa1afc3b48ec3768ff90f87b
Parents: d1d1c64
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 09:19:06 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 09:19:06 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml| 12 ++--
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 115 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/57f01301/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 8fc1283..d155734 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+versionapollo-project-1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/57f01301/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 06ab8f2..e08c545 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+versionapollo-project-1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  versionapollo-project-1.7.1/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7

[1/2] activemq-apollo git commit: Update the parent pom version.

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk c8d08cc87 - 57f013017


Update the parent pom version.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/d1d1c64a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/d1d1c64a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/d1d1c64a

Branch: refs/heads/trunk
Commit: d1d1c64ae0b232ef8dd8c32f364ed8eaf38f8ca6
Parents: c8d08cc
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 09:06:20 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 09:10:12 2015 -0500

--
 pom.xml | 28 ++--
 1 file changed, 22 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/d1d1c64a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 877a2fa..eb25dc3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache/groupId
 artifactIdapache/artifactId
-version9/version
+version16/version
   /parent
   modelVersion4.0.0/modelVersion
 
@@ -127,6 +127,7 @@
 scala-plugin-version3.1.0/scala-plugin-version
 maven-surefire-plugin-version2.12/maven-surefire-plugin-version
 jetty-plugin-version7.0.1.v20091125/jetty-plugin-version
+maven-release-plugin-version2.4.1/maven-release-plugin-version
 
 !-- disable unique version timestamps in snapshots --
 uniqueVersionfalse/uniqueVersion
@@ -247,6 +248,7 @@
 
   build
   
+!--
 extensions
   extension
 groupIdcom.google.code.maven-svn-wagon/groupId
@@ -254,6 +256,7 @@
 version1.4/version
   /extension
 /extensions
+--
 
 !-- to allow the eclipse profile to use a different target directory --
 outputDirectory${basedir}/${target-dir}/classes/outputDirectory
@@ -362,15 +365,28 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-release-plugin/artifactId
-  version2.1/version
+  version${maven-release-plugin-version}/version
   configuration
-useReleaseProfilefalse/useReleaseProfile
-goalsdeploy/goals
-arguments-Papache-release/arguments
 autoVersionSubmodulestrue/autoVersionSubmodules
+allowTimestampedSnapshotsfalse/allowTimestampedSnapshots
+preparationGoalsclean install/preparationGoals
+goalsdeploy/goals
+remoteTaggingfalse/remoteTagging
+suppressCommitBeforeTagfalse/suppressCommitBeforeTag
   /configuration
+  dependencies
+dependency
+ groupIdorg.apache.maven.scm/groupId
+ artifactIdmaven-scm-api/artifactId
+ version1.8.1/version
+/dependency
+  dependency
+ groupIdorg.apache.maven.scm/groupId
+ artifactIdmaven-scm-provider-gitexe/artifactId
+ version1.8.1/version
+   /dependency
+ /dependencies
 /plugin
-
   /plugins
 /pluginManagement
 plugins

Git Push Summary

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Tags:  refs/tags/apollo-project-apollo-project-1.7.1 [created] c33d62787

activemq-apollo git commit: [maven-release-plugin] prepare for next development iteration

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 57f013017 - 1562336a1


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/1562336a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/1562336a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/1562336a

Branch: refs/heads/trunk
Commit: 1562336a1da6a71f7aaa6c9eb3b6eabb1be1fde5
Parents: 57f0130
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 09:19:22 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 09:19:22 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 112 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/1562336a/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index d155734..8fc1283 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-versionapollo-project-1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/1562336a/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index e08c545..06ab8f2 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-versionapollo-project-1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  versionapollo-project-1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name

Git Push Summary

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Tags:  refs/tags/apollo-project-apollo-project-1.7.1 [deleted] c33d62787

[2/2] activemq-apollo git commit: [maven-release-plugin] prepare for next development iteration

2015-01-29 Thread chirino

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/60489d13
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/60489d13
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/60489d13

Branch: refs/heads/trunk
Commit: 60489d13a04ae091086f8799da47fa78628c7c64
Parents: d26d67a
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:33:35 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:33:35 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 112 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/60489d13/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 6197f4f..8fc1283 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/60489d13/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 387124b..06ab8f2 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7.1/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7.1/version
+  version99-trunk-SNAPSHOT/version

[1/2] activemq-apollo git commit: [maven-release-plugin] prepare release apollo-project-1.7.1

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 7698cdb94 - 60489d13a


[maven-release-plugin] prepare release apollo-project-1.7.1


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/d26d67aa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/d26d67aa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/d26d67aa

Branch: refs/heads/trunk
Commit: d26d67aab24e451623fdf8b88d2bb96b255e60cf
Parents: 7698cdb
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Jan 29 10:33:25 2015 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Jan 29 10:33:25 2015 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  4 ++--
 20 files changed, 112 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/d26d67aa/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 8fc1283..6197f4f 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/d26d67aa/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 06ab8f2..387124b 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7.1/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7.1/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo

[jira] [Updated] (APLO-355) Stomp Websocke example doesn't work for utf-8 String


 [ 
https://issues.apache.org/jira/browse/APLO-355?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-355:
---
Affects Version/s: 1.7.1

 Stomp Websocke example doesn't work for utf-8 String
 

 Key: APLO-355
 URL: https://issues.apache.org/jira/browse/APLO-355
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-stomp
Affects Versions: 1.7
 Environment: apache-apollo-1.7
 linux debian testing
 iceweasel 24.4.0 chromium 33.0.1750.152
Reporter: leiqin
Assignee: Hiram Chirino
 Fix For: 1.7.1, 1.8


 when I send a utf-8 String to Char Room ,  it not receive what I send , for 
 example:
 I send : 你好
 the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:2
 你好
  MESSAGE
 subscription:sub-0
 message-id:apollo-broker-312
 destination:/topic/chat.general
 content-length:2
 `}
 I receive '`}' not '你好'
 then , I found the content-length is not correct in utf-8 ,in utf-8 '你好' has 
 6 byte .
 then I change the js/stomp.js to use 
 https://github.com/jmesnil/stomp-websocket
 I see the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:6
 你好
 the content-length is correct , but I didn't receive any message .
 after a while , the Debug Log show me :
  ERROR
 message:Expected null terminator after 6 content bytes
 Whoops! Lost connection to ws://localhost:61623/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (APLO-355) Stomp Websocke example doesn't work for utf-8 String


 [ 
https://issues.apache.org/jira/browse/APLO-355?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-355:
---
Fix Version/s: 1.7.1

 Stomp Websocke example doesn't work for utf-8 String
 

 Key: APLO-355
 URL: https://issues.apache.org/jira/browse/APLO-355
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-stomp
Affects Versions: 1.7
 Environment: apache-apollo-1.7
 linux debian testing
 iceweasel 24.4.0 chromium 33.0.1750.152
Reporter: leiqin
Assignee: Hiram Chirino
 Fix For: 1.7.1, 1.8


 when I send a utf-8 String to Char Room ,  it not receive what I send , for 
 example:
 I send : 你好
 the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:2
 你好
  MESSAGE
 subscription:sub-0
 message-id:apollo-broker-312
 destination:/topic/chat.general
 content-length:2
 `}
 I receive '`}' not '你好'
 then , I found the content-length is not correct in utf-8 ,in utf-8 '你好' has 
 6 byte .
 then I change the js/stomp.js to use 
 https://github.com/jmesnil/stomp-websocket
 I see the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:6
 你好
 the content-length is correct , but I didn't receive any message .
 after a while , the Debug Log show me :
  ERROR
 message:Expected null terminator after 6 content bytes
 Whoops! Lost connection to ws://localhost:61623/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Updated] (APLO-366) XPath selector - make xml parser features configurable


 [ 
https://issues.apache.org/jira/browse/APLO-366?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-366:
---
Fix Version/s: 1.7.1

 XPath selector - make xml parser features configurable
 --

 Key: APLO-366
 URL: https://issues.apache.org/jira/browse/APLO-366
 Project: ActiveMQ Apollo
  Issue Type: Bug
Affects Versions: 1.7
Reporter: Dejan Bosanac
Assignee: Dejan Bosanac
 Fix For: 1.7.1, 1.8


 We need to be able to set xml parser features configurable using system 
 properties.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Git Push Summary

2015-01-29 Thread chirino

Repository: activemq-apollo
Updated Tags:  refs/tags/apollo-project-1.7.1 [created] 85fe35962

[jira] [Updated] (APLO-355) Stomp Websocke example doesn't work for utf-8 String


 [ 
https://issues.apache.org/jira/browse/APLO-355?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-355:
---
Affects Version/s: (was: 1.7.1)

 Stomp Websocke example doesn't work for utf-8 String
 

 Key: APLO-355
 URL: https://issues.apache.org/jira/browse/APLO-355
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-stomp
Affects Versions: 1.7
 Environment: apache-apollo-1.7
 linux debian testing
 iceweasel 24.4.0 chromium 33.0.1750.152
Reporter: leiqin
Assignee: Hiram Chirino
 Fix For: 1.7.1, 1.8


 when I send a utf-8 String to Char Room ,  it not receive what I send , for 
 example:
 I send : 你好
 the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:2
 你好
  MESSAGE
 subscription:sub-0
 message-id:apollo-broker-312
 destination:/topic/chat.general
 content-length:2
 `}
 I receive '`}' not '你好'
 then , I found the content-length is not correct in utf-8 ,in utf-8 '你好' has 
 6 byte .
 then I change the js/stomp.js to use 
 https://github.com/jmesnil/stomp-websocket
 I see the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:6
 你好
 the content-length is correct , but I didn't receive any message .
 after a while , the Debug Log show me :
  ERROR
 message:Expected null terminator after 6 content bytes
 Whoops! Lost connection to ws://localhost:61623/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

activemq git commit: Implements https://issues.apache.org/jira/browse/AMQ-5458 - Also needed to update the slave since it does writes slightly differently.

2014-11-26 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk 4141d6a22 - f4149c0a4


Implements https://issues.apache.org/jira/browse/AMQ-5458 - Also needed to 
update the slave since it does writes slightly differently. 


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f4149c0a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f4149c0a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f4149c0a

Branch: refs/heads/trunk
Commit: f4149c0a46a3ab92eebbeb1895fd484d3ad29ebb
Parents: 4141d6a
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Wed Nov 26 08:36:32 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Wed Nov 26 08:36:43 2014 -0500

--
 .../activemq/leveldb/replicated/SlaveLevelDBStore.scala | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/f4149c0a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
index 8720987..0eddb0f 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
@@ -192,7 +192,8 @@ class SlaveLevelDBStore extends LevelDBStore with 
ReplicatedLevelDBStoreTrait {
 trace(%s, Slave WAL update: (file:%s, offset: %d, length: 
%d).format(directory, value.file.toHexString, value.offset, value.length))
 val file = client.log.next_log(value.file)
 val buffer = map(file, value.offset, value.length, false)
-session.codec.readData(buffer, ^{
+
+def readData = session.codec.readData(buffer, ^{
   if( value.sync ) {
 buffer.force()
   }
@@ -208,6 +209,15 @@ class SlaveLevelDBStore extends LevelDBStore with 
ReplicatedLevelDBStoreTrait {
 send_wal_ack
   }
 })
+
+if( client.log.recordLogTestSupport!=null ) {
+  client.log.recordLogTestSupport.writeCall.call {
+readData
+  }
+} else {
+  readData
+}
+
   case LOG_DELETE_ACTION =
 
 val value = JsonCodec.decode(command.body, classOf[LogDelete])

activemq git commit: Implements https://issues.apache.org/jira/browse/AMQ-5458 - Lets make sure we register the Test mbean when in slave mode.

2014-11-26 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk f4149c0a4 - 4e3499e41


Implements https://issues.apache.org/jira/browse/AMQ-5458 - Lets make sure we 
register the Test mbean when in slave mode.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4e3499e4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4e3499e4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4e3499e4

Branch: refs/heads/trunk
Commit: 4e3499e41bf1158b4b3b9a46cf58263d695cc097
Parents: f4149c0
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Wed Nov 26 10:57:13 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Wed Nov 26 10:57:13 2014 -0500

--
 .../org/apache/activemq/leveldb/LevelDBStore.scala  |  4 ++--
 .../activemq/leveldb/replicated/SlaveLevelDBStore.scala | 12 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/4e3499e4/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index b10cd3e..49e8cfa 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -293,7 +293,7 @@ class LevelDBStore extends LockableServiceSupport with 
BrokerServiceAware with P
   try {
 AnnotatedMBean.registerMBean(brokerService.getManagementContext, new 
LevelDBStoreView(this), objectName)
 if( java.lang.Boolean.getBoolean(org.apache.activemq.leveldb.test) ) 
{
-  val name = new ObjectName(objectName.toString + ,test=test)
+  val name = new ObjectName(objectName.toString + ,view=Test)
   AnnotatedMBean.registerMBean(brokerService.getManagementContext, new 
LevelDBStoreTest(this), name)
 }
   } catch {
@@ -353,7 +353,7 @@ class LevelDBStore extends LockableServiceSupport with 
BrokerServiceAware with P
 if(brokerService!=null  brokerService.isUseJmx){
   brokerService.getManagementContext().unregisterMBean(objectName);
   if( java.lang.Boolean.getBoolean(org.apache.activemq.leveldb.test) )
-brokerService.getManagementContext().unregisterMBean(new 
ObjectName(objectName.toString+,test=test));
+brokerService.getManagementContext().unregisterMBean(new 
ObjectName(objectName.toString+,view=Test));
 }
 info(Stopped +this)
   }

http://git-wip-us.apache.org/repos/asf/activemq/blob/4e3499e4/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
index 0eddb0f..cbacc77 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.leveldb.replicated
 
-import org.apache.activemq.leveldb.{LevelDBClient, LevelDBStore}
+import org.apache.activemq.leveldb.{LevelDBStoreTest, LevelDBClient, 
LevelDBStore}
 import org.apache.activemq.util.ServiceStopper
 import java.util
 import org.fusesource.hawtdispatch._
@@ -30,6 +30,8 @@ import FileSupport._
 import java.io.{IOException, RandomAccessFile, File}
 import scala.beans.BeanProperty
 import java.util.concurrent.{CountDownLatch, TimeUnit}
+import javax.management.ObjectName
+import org.apache.activemq.broker.jmx.AnnotatedMBean
 
 object SlaveLevelDBStore extends Log
 
@@ -79,10 +81,18 @@ class SlaveLevelDBStore extends LevelDBStore with 
ReplicatedLevelDBStoreTrait {
 db.client.dirtyIndexFile.recursiveDelete
 db.client.plistIndexFile.recursiveDelete
 start_slave_connections
+
+if( java.lang.Boolean.getBoolean(org.apache.activemq.leveldb.test) ) {
+  val name = new ObjectName(objectName.toString + ,view=Test)
+  AnnotatedMBean.registerMBean(brokerService.getManagementContext, new 
LevelDBStoreTest(this), name)
+}
   }
 
   var stopped = false
   override def doStop(stopper: ServiceStopper) = {
+if( java.lang.Boolean.getBoolean(org.apache.activemq.leveldb.test) )
+  brokerService.getManagementContext().unregisterMBean(new 
ObjectName(objectName.toString+,view=Test));
+
 val latch = new CountDownLatch(1

activemq git commit: Implements https://issues.apache.org/jira/browse/AMQ-5458

2014-11-25 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk 74f530a64 - ebafd5c19


Implements https://issues.apache.org/jira/browse/AMQ-5458 


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ebafd5c1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ebafd5c1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ebafd5c1

Branch: refs/heads/trunk
Commit: ebafd5c19388ce183299c2c41c966c5580e87821
Parents: 74f530a
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Tue Nov 25 11:40:48 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Tue Nov 25 11:41:00 2014 -0500

--
 .../activemq/leveldb/LevelDBStoreTestMBean.java |  56 ++
 .../apache/activemq/leveldb/LevelDBStore.scala  |  75 +
 .../org/apache/activemq/leveldb/RecordLog.scala | 106 ++-
 3 files changed, 232 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ebafd5c1/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreTestMBean.java
--
diff --git 
a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreTestMBean.java
 
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreTestMBean.java
new file mode 100644
index 000..63338a8
--- /dev/null
+++ 
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreTestMBean.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+
+package org.apache.activemq.leveldb;
+
+import org.apache.activemq.broker.jmx.MBeanInfo;
+
+/**
+ * p
+ * /p
+ *
+ * @author a href=http://hiramchirino.com;Hiram Chirino/a
+ */
+public interface LevelDBStoreTestMBean {
+
+@MBeanInfo(Used to set if the log force calls should be suspended)
+void setSuspendForce(boolean value);
+
+@MBeanInfo(Gets if the log force calls should be suspended)
+boolean getSuspendForce();
+
+@MBeanInfo(Gets the number of threads waiting to do a log force call.)
+long getForceCalls();
+
+@MBeanInfo(Used to set if the log write calls should be suspended)
+void setSuspendWrite(boolean value);
+
+@MBeanInfo(Gets if the log write calls should be suspended)
+boolean getSuspendWrite();
+
+@MBeanInfo(Gets the number of threads waiting to do a log write call.)
+long getWriteCalls();
+
+@MBeanInfo(Used to set if the log delete calls should be suspended)
+void setSuspendDelete(boolean value);
+
+@MBeanInfo(Gets if the log delete calls should be suspended)
+boolean getSuspendDelete();
+
+@MBeanInfo(Gets the number of threads waiting to do a log delete call.)
+long getDeleteCalls();
+}

http://git-wip-us.apache.org/repos/asf/activemq/blob/ebafd5c1/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index f86e05b..b10cd3e 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -37,6 +37,7 @@ import org.fusesource.hawtbuf.{UTF8Buffer, 
DataByteArrayOutputStream}
 import org.fusesource.hawtdispatch;
 import org.apache.activemq.broker.scheduler.JobSchedulerStore
 import org.apache.activemq.store.IndexListener.MessageContext
+import javax.management.ObjectName
 
 object LevelDBStore extends Log {
   val DEFAULT_DIRECTORY = new File(LevelDB);
@@ -82,6 +83,74 @@ case class DurableSubscription(subKey:Long, topicKey:Long, 
info: SubscriptionInf
   var cursorPosition = 0L
 }
 
+class LevelDBStoreTest(val store:LevelDBStore) extends LevelDBStoreTestMBean {
+
+  import store._
+  var suspendForce = false;
+  
+  override def setSuspendForce(value

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - October 2014

2014-10-06 Thread Hiram Chirino (Confluence)















  


Hiram Chirino edited the page:
 


Apache ActiveMQ Board Report - October 2014   






...
Community:* The development and user lists continue to stay active.* Dan Kulp became a committer 7/21/14* HornetQ project has started talks about donating their codebase to the ASF. The ActiveMQ project is shepherding the ip clearance and is working towards integrating them into the project. * HornetQ code donation accepted by ActiveMQ Project - 9/30/14  * 5 HornetQ committers (Clebert Suconic, Andy Taylor, JustinBertram, Youg Hao Gao, Martyn Taylor)added as committers to ActiveMQ Project- 9/30/14 
Development:* Development on ActiveMQ 5.11 is in progress.
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - October 2014

2014-09-29 Thread Hiram Chirino (Confluence)















  


Hiram Chirino created a page:
 


Apache ActiveMQ Board Report - October 2014   





TLP Description:Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.
Community:* The development and user lists continue to stay active.* Dan Kulp became a committer 7/21/14* HornetQ project has started talks about donating their codebase to the ASF. The ActiveMQ project is shepherding the ip clearance and is working towards integrating them into the project.
Development:* Development on ActiveMQ 5.11 is in progress.
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases:* Apache ActiveMQ-CPP v3.8.3- 7/17/14 * Apache.NMS.ActiveMQ 1.6.3 - 7/21/14 * Apache.NMS.ActiveMQ 1.6.4 - 9/12/14 

  






 View Online   Like  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

git commit: Support configuring a connectUrl on the leveldb store in case your running in a system like OpenShift where clients connect to a different ip:port from the one that the sever binds.

2014-08-27 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk b9696ac80 - b76d8318d


Support configuring a connectUrl on the leveldb store in case your running in a 
system like OpenShift where clients connect to a different ip:port from the one 
that the sever binds.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b76d8318
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b76d8318
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b76d8318

Branch: refs/heads/trunk
Commit: b76d8318d7b87f6d121d485a62ea63e7601d574e
Parents: b9696ac
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Tue Aug 26 17:04:25 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Wed Aug 27 13:08:01 2014 -0400

--
 .../leveldb/replicated/ElectingLevelDBStore.scala | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b76d8318/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
index 9a1852e..fe20530 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
@@ -78,6 +78,10 @@ class ElectingLevelDBStore extends ProxyLevelDBStore {
 
   @BeanProperty
   var hostname: String = _
+
+  @BeanProperty
+  var connectUrl: String = _
+
   @BeanProperty
   var bind = tcp://0.0.0.0:61619
 
@@ -371,10 +375,14 @@ class ElectingLevelDBStore extends ProxyLevelDBStore {
   }
 
   def address(port: Int) = {
-if (hostname == null) {
-  hostname = machine_hostname
+if( connectUrl==null ) {
+  if (hostname == null) {
+hostname = machine_hostname
+  }
+  tcp:// + hostname + : + port
+} else {
+  connectUrl;
 }
-tcp:// + hostname + : + port
   }
 
   override def size: Long = {

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - July 2014

2014-07-02 Thread Hiram Chirino (Confluence)















  


Hiram Chirino created a page:
 


Apache ActiveMQ Board Report - July 2014   





TLP Description:Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.
Community:* The development and user lists continue to stay active.* Dhiraj Bokde became a committer 6/6/14
Development:* Development on ActiveMQ 5.11 has started
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases:* Apache ActiveMQ 5.10.0 - 6/10/14





 View Online   Like  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[jira] [Commented] (APLO-356) Startup message graphics corrupt on Windows

2014-06-02 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-356?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14015461#comment-14015461
 ] 

Hiram Chirino commented on APLO-356:


Ah. We need hook in jansi for ANSI processing.  We lost it when we moved off 
the karaf libs for the command handling.

 Startup message graphics corrupt on Windows
 ---

 Key: APLO-356
 URL: https://issues.apache.org/jira/browse/APLO-356
 Project: ActiveMQ Apollo
  Issue Type: Improvement
  Components: apollo-broker
Affects Versions: 1.7
 Environment: Windows 8
Reporter: Michael Justin
Priority: Minor

 With Apollo 1.6 the startup message graphics looked ok, but 1.7 displays only 
 escape characters. On Linux (Ubuntu), 1.7 startup message graphics are ok.



--
This message was sent by Atlassian JIRA
(v6.2#6252)

[jira] [Assigned] (APLO-356) Startup message graphics corrupt on Windows

2014-06-02 Thread Hiram Chirino (JIRA)


 [ 
https://issues.apache.org/jira/browse/APLO-356?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino reassigned APLO-356:
--

Assignee: Hiram Chirino

 Startup message graphics corrupt on Windows
 ---

 Key: APLO-356
 URL: https://issues.apache.org/jira/browse/APLO-356
 Project: ActiveMQ Apollo
  Issue Type: Improvement
  Components: apollo-broker
Affects Versions: 1.7
 Environment: Windows 8
Reporter: Michael Justin
Assignee: Hiram Chirino
Priority: Minor

 With Apollo 1.6 the startup message graphics looked ok, but 1.7 displays only 
 escape characters. On Linux (Ubuntu), 1.7 startup message graphics are ok.



--
This message was sent by Atlassian JIRA
(v6.2#6252)

git commit: Upgrade jaxb version so that the project builds against Java 8.

2014-05-15 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 1e3eadff4 - e29cfd509


Upgrade jaxb version so that the project builds against Java 8.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/e29cfd50
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/e29cfd50
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/e29cfd50

Branch: refs/heads/trunk
Commit: e29cfd509d8c5f871b140b1392797f7f39568cd1
Parents: 1e3eadf
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Wed May 7 20:50:05 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Wed May 7 20:50:05 2014 -0400

--
 apollo-dto/pom.xml | 12 +++-
 pom.xml|  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e29cfd50/apollo-dto/pom.xml
--
diff --git a/apollo-dto/pom.xml b/apollo-dto/pom.xml
index 2a76795..253f4e5 100644
--- a/apollo-dto/pom.xml
+++ b/apollo-dto/pom.xml
@@ -105,13 +105,12 @@
 version1.7/version
 executions
   execution
-phasegenerate-resources/phase
+phaseprocess-classes/phase
 configuration
   tasks
-taskdef name=schemagen 
classname=com.sun.tools.jxc.SchemaGenTask
-  classpath refid=maven.compile.classpath /
-/taskdef
+taskdef name=schemagen 
classname=com.sun.tools.jxc.SchemaGenTask/
 mkdir 
dir=${project.build.directory}/schema/org/apache/activemq/apollo/dto /
+echo message=Generating XSD to: 
${project.build.directory}/schema/org/apache/activemq/apollo/dto/
 schemagen srcdir=${basedir}/.. 
destdir=${project.build.directory}/schema/org/apache/activemq/apollo/dto 
includeantruntime=false
   schema 
namespace=http://activemq.apache.org/schema/activemq/apollo; file=apollo.xsd 
/
   classpath refid=maven.compile.classpath /
@@ -127,6 +126,9 @@
 replace token=lt;/xs:sequencegt; 
value=lt;/xs:choicegt;lt;/xs:choicegt; 
dir=${basedir}/target/schema/org/apache/activemq/apollo/dto
   include name=**/*.xsd /
 /replace
+copy todir=${project.build.directory}/classes
+  fileset dir=${project.build.directory}/schema/
+/copy
   /tasks
 /configuration
 goals
@@ -147,7 +149,7 @@
/dependency
dependency
   groupIdcom.sun.xml.bind/groupId
-  artifactIdjaxb-xjc/artifactId
+  artifactIdjaxb-jxc/artifactId
   version${jaxb-version}/version
/dependency
 /dependencies  

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e29cfd50/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5eeeb17..877a2fa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
 slf4j-version1.6.1/slf4j-version
 mqtt-client-version1.9/mqtt-client-version
 
-jaxb-api-version2.1/jaxb-api-version
-jaxb-version2.1.6/jaxb-version
-xjc-version2.1.10.1/xjc-version
+jaxb-api-version2.2.7/jaxb-api-version
+jaxb-version2.2.7/jaxb-version
+xjc-version2.2.7/xjc-version
 stax-api-version1.0.1/stax-api-version
 stax-version1.2.0/stax-version

git commit: Fixes AMQ-5176: Support building ActiveMQ using Java 8 JDK

2014-05-13 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk a20c3a07a - bdb24ee7c


Fixes AMQ-5176: Support building ActiveMQ using Java 8 JDK


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bdb24ee7
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bdb24ee7
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bdb24ee7

Branch: refs/heads/trunk
Commit: bdb24ee7c78aa037a085bc7ce90bd216a3a13d3d
Parents: a20c3a0
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Wed May 7 10:53:31 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Wed May 7 10:53:51 2014 -0400

--
 activemq-leveldb-store/pom.xml  |  4 ++--
 .../apache/activemq/leveldb/LevelDBStore.scala  |  2 +-
 .../replicated/ElectingLevelDBStore.scala   |  2 +-
 .../leveldb/replicated/MasterLevelDBStore.scala |  2 +-
 .../ReplicatedLevelDBStoreTrait.scala   |  2 +-
 .../leveldb/replicated/SlaveLevelDBStore.scala  |  2 +-
 .../replicated/groups/ClusteredSingleton.scala  |  2 +-
 .../activemq/leveldb/dfs/DFSLevelDBStore.scala  |  2 +-
 .../apache/activemq/partition/dto/Target.java   |  3 +--
 activemq-runtime-config/pom.xml | 21 
 .../DurableSubscriptionOffline1Test.java|  3 +--
 .../activemq/config/ValidateXMLConfigTest.java  |  3 +--
 pom.xml |  6 +++---
 13 files changed, 36 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/pom.xml
--
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 6f68731..5cafb48 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -59,7 +59,7 @@
 /dependency
 dependency
   groupIdorg.fusesource.hawtdispatch/groupId
-  artifactIdhawtdispatch-scala/artifactId
+  artifactIdhawtdispatch-scala-2.11/artifactId
   version${hawtdispatch-version}/version
 /dependency
 dependency
@@ -319,7 +319,7 @@
 /dependency
 dependency
   groupIdorg.scalatest/groupId
-  artifactIdscalatest_${scala-version}/artifactId
+  artifactIdscalatest_2.11/artifactId
   version${scalatest-version}/version
   scopetest/scope
 /dependency

http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index d1f8f6b..146269d 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -25,7 +25,7 @@ import java.io.File
 import java.io.IOException
 import java.util.concurrent._
 import java.util.concurrent.atomic.AtomicLong
-import reflect.BeanProperty
+import beans.BeanProperty
 import org.apache.activemq.store._
 import java.util._
 import collection.mutable.ListBuffer

http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
index 4ff4288..9a1852e 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
@@ -17,7 +17,7 @@
 package org.apache.activemq.leveldb.replicated
 
 import org.linkedin.util.clock.Timespan
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 import org.apache.activemq.util.ServiceStopper
 import org.apache.activemq.leveldb.{LevelDBClient, RecordLog, LevelDBStore}
 import java.net.{NetworkInterface, InetAddress}

http://git-wip-us.apache.org/repos/asf/activemq/blob/bdb24ee7/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
index 6de5f63

[2/2] git commit: Fixed bug https://issues.apache.org/jira/browse/APLO-355

2014-04-29 Thread chirino

Fixed bug https://issues.apache.org/jira/browse/APLO-355


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/1e3eadff
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/1e3eadff
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/1e3eadff

Branch: refs/heads/trunk
Commit: 1e3eadff46fa4b3bb2ca2ae7ec905e831b83818c
Parents: 35c3c79
Author: leiqin leiqin2...@gmail.com
Authored: Mon Apr 28 16:29:26 2014 +0800
Committer: leiqin leiqin2...@gmail.com
Committed: Mon Apr 28 16:29:26 2014 +0800

--
 .../jetty/WebSocketTransportFactory.scala   |   8 +-
 .../examples/stomp/websocket/js/stomp.js| 207 ++-
 2 files changed, 155 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/1e3eadff/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
--
diff --git 
a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
 
b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
index d3fb727..df921f4 100644
--- 
a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
+++ 
b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala
@@ -36,7 +36,7 @@ import java.nio.channels._
 import scala.collection.mutable.ListBuffer
 import java.util.concurrent.{ExecutorService, Executor, ArrayBlockingQueue}
 import org.fusesource.hawtdispatch.transport.ProtocolCodec.BufferState
-import org.fusesource.hawtbuf.{AsciiBuffer, Buffer}
+import org.fusesource.hawtbuf.{UTF8Buffer, AsciiBuffer, Buffer}
 import java.io.{EOFException, IOException}
 import java.security.cert.X509Certificate
 import org.apache.activemq.apollo.broker.web.AllowAnyOriginFilter
@@ -366,7 +366,7 @@ object WebSocketTransportFactory extends 
TransportFactory.Provider with Log {
 first_message = false
   }
   // Convert string messages to bytes messages..  our codecs just work 
with bytes..
-  var buffer = new AsciiBuffer(str)
+  var buffer = new UTF8Buffer(str)
   onMessage(buffer.data, buffer.offset, buffer.length)
 }
 
@@ -597,7 +597,7 @@ object WebSocketTransportFactory extends 
TransportFactory.Provider with Log {
   if( service_state.is_starting_or_started || !write_failed) {
 try {
   if (!binary_transfers) {
-connection.sendMessage(buffer.ascii().toString)
+connection.sendMessage(buffer.utf8().toString)
   } else {
 connection.sendMessage(buffer.data, buffer.offset, 
buffer.length)
   }
@@ -622,4 +622,4 @@ object WebSocketTransportFactory extends 
TransportFactory.Provider with Log {
   }
 
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/1e3eadff/apollo-distro/src/main/release/examples/stomp/websocket/js/stomp.js
--
diff --git 
a/apollo-distro/src/main/release/examples/stomp/websocket/js/stomp.js 
b/apollo-distro/src/main/release/examples/stomp/websocket/js/stomp.js
index 3e237f1..9299345 100644
--- a/apollo-distro/src/main/release/examples/stomp/websocket/js/stomp.js
+++ b/apollo-distro/src/main/release/examples/stomp/websocket/js/stomp.js
@@ -1,16 +1,24 @@
-// Generated by CoffeeScript 1.3.3
+// Generated by CoffeeScript 1.6.3
+/*
+   Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache 
License V2.0
+
+   Copyright (C) 2010-2013 [Jeff Mesnil](http://jmesnil.net/)
+   Copyright (C) 2012 [FuseSource, Inc.](http://fusesource.com)
+*/
+
+
 (function() {
   var Byte, Client, Frame, Stomp,
-__hasProp = {}.hasOwnProperty;
-  
-  var MAX_FRAME_SIZE=16*1024;;
-  
+__hasProp = {}.hasOwnProperty,
+__slice = [].slice;
+
   Byte = {
 LF: '\x0A',
 NULL: '\x00'
   };
 
   Frame = (function() {
+var unmarshallSingle;
 
 function Frame(command, headers, body) {
   this.command = command;
@@ -28,14 +36,22 @@
 lines.push( + name + : + value);
   }
   if (this.body) {
-lines.push(content-length: + ('' + this.body).length);
+lines.push(content-length: + (Frame.sizeOfUTF8(this.body)));
   }
   lines.push(Byte.LF + this.body);
   return lines.join(Byte.LF);
 };
 
-Frame._unmarshallSingle = function(data) {
-  var body, chr, command, divider, headerLines, headers, i, idx, len, 
line, start, trim, _i, _j, _ref, _ref1;
+Frame.sizeOfUTF8 = function(s) {
+  if (s) {
+return encodeURI(s).split(/%..|./).length - 1;
+

[1/2] git commit: add a test cast to shows stomp websocket utf-8 handing failing

2014-04-29 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 3ab49df79 - 1e3eadff4


add a test cast to shows stomp websocket utf-8 handing failing


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/35c3c798
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/35c3c798
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/35c3c798

Branch: refs/heads/trunk
Commit: 35c3c798e6eb346238bbc5490b378df3a6df911e
Parents: 3ab49df
Author: leiqin leiqin2...@gmail.com
Authored: Sun Apr 27 18:32:26 2014 +0800
Committer: leiqin leiqin2...@gmail.com
Committed: Sun Apr 27 18:32:26 2014 +0800

--
 .../apollo/stomp/test/websocket-utf-8.html  | 60 +
 .../apollo/stomp/test/StompWebSocketTests.scala | 68 
 .../apollo/stomp/test/WebSocketSupport.scala|  2 +
 3 files changed, 130 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/35c3c798/apollo-stomp/src/test/resources/org/apache/activemq/apollo/stomp/test/websocket-utf-8.html
--
diff --git 
a/apollo-stomp/src/test/resources/org/apache/activemq/apollo/stomp/test/websocket-utf-8.html
 
b/apollo-stomp/src/test/resources/org/apache/activemq/apollo/stomp/test/websocket-utf-8.html
new file mode 100644
index 000..fdafede
--- /dev/null
+++ 
b/apollo-stomp/src/test/resources/org/apache/activemq/apollo/stomp/test/websocket-utf-8.html
@@ -0,0 +1,60 @@
+!DOCTYPE html
+!--
+  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.
+--
+html lang=en
+head
+meta charset=utf-8
+titleChat Example Using STOMP Over WebSockets/title
+!--[if lt IE 9]
+script src=http://html5shim.googlecode.com/svn/trunk/html5.js;/script
+![endif]--
+script src='jquery.js'/script
+script src='stomp.js'/script
+script//![CDATA[
+String.prototype.repeat = function( num ) {
+return new Array( num + 1 ).join( this );
+}
+
+$(document).ready(function() {
+if(window.WebSocket) {
+var url = ws://localhost:61623;
+if(window.location.hash) {
+url = window.location.hash.substring(1);
+}
+var login = admin;
+var passcode = password;
+destination = /queue/websocket;
+
+client = Stomp.client(url);
+
+// the client is notified when it is connected to the server.
+client.connect(login, passcode, function(frame) {
+client.send(destination, null, ä½ å¥½);
+$(#status).html(Sent);
+
+});
+} else {
+$(#status).html(No WebSockets);
+}
+});
+//]]/script
+/head
+body
+div id=statusMessage not sent/div
+div id=received/div
+/body
+/html

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/35c3c798/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala
--
diff --git 
a/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala
 
b/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala
index 4d91e88..04e0da5 100644
--- 
a/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala
+++ 
b/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala
@@ -127,6 +127,7 @@ object StompWebSocketTests {
 
 driver.get(url + # + protocol + ://127.0.0.1: + ws_port);
 
+Thread.sleep(100)
 val web_status = driver.findElement(By.id(status));
 
 while (Message not sent == web_status.getText) {
@@ -144,6 +145,73 @@ object StompWebSocketTests {
 
   }
 }
+
+// broker sends client utf-8 message..
+for (protocol - Array(ws, wss)) {
+  test(websockets utf-8 messages to client:  + protocol) {
+
+val url = http://localhost:; + jetty_port + /websocket.html
+val ws_port: Int =

[jira] [Resolved] (APLO-355) Stomp Websocke example doesn't work for utf-8 String

2014-04-29 Thread Hiram Chirino (JIRA)


 [ 
https://issues.apache.org/jira/browse/APLO-355?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino resolved APLO-355.


   Resolution: Fixed
Fix Version/s: 1.8
 Assignee: Hiram Chirino

Thanks for the test and fix!  Patch merged.

 Stomp Websocke example doesn't work for utf-8 String
 

 Key: APLO-355
 URL: https://issues.apache.org/jira/browse/APLO-355
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-stomp
Affects Versions: 1.7
 Environment: apache-apollo-1.7
 linux debian testing
 iceweasel 24.4.0 chromium 33.0.1750.152
Reporter: 雷钦
Assignee: Hiram Chirino
 Fix For: 1.8


 when I send a utf-8 String to Char Room ,  it not receive what I send , for 
 example:
 I send : 你好
 the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:2
 你好
  MESSAGE
 subscription:sub-0
 message-id:apollo-broker-312
 destination:/topic/chat.general
 content-length:2
 `}
 I receive '`}' not '你好'
 then , I found the content-length is not correct in utf-8 ,in utf-8 '你好' has 
 6 byte .
 then I change the js/stomp.js to use 
 https://github.com/jmesnil/stomp-websocket
 I see the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:6
 你好
 the content-length is correct , but I didn't receive any message .
 after a while , the Debug Log show me :
  ERROR
 message:Expected null terminator after 6 content bytes
 Whoops! Lost connection to ws://localhost:61623/



--
This message was sent by Atlassian JIRA
(v6.2#6252)

[jira] [Commented] (APLO-355) Stomp Websocke example doesn't work for utf-8 String

2014-04-24 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-355?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13979828#comment-13979828
 ] 

Hiram Chirino commented on APLO-355:


Hi,

If you get chance could you see if you add a test case that shows the utf-8 
handling failing?  The selenium junit tests form stomp/websocket stuff can be 
found at: 

https://github.com/apache/activemq-apollo/blob/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompWebSocketTests.scala



 Stomp Websocke example doesn't work for utf-8 String
 

 Key: APLO-355
 URL: https://issues.apache.org/jira/browse/APLO-355
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-stomp
Affects Versions: 1.7
 Environment: apache-apollo-1.7
 linux debian testing
 iceweasel 24.4.0 chromium 33.0.1750.152
Reporter: 雷钦

 when I send a utf-8 String to Char Room ,  it not receive what I send , for 
 example:
 I send : 你好
 the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:2
 你好
  MESSAGE
 subscription:sub-0
 message-id:apollo-broker-312
 destination:/topic/chat.general
 content-length:2
 `}
 I receive '`}' not '你好'
 then , I found the content-length is not correct in utf-8 ,in utf-8 '你好' has 
 6 byte .
 then I change the js/stomp.js to use 
 https://github.com/jmesnil/stomp-websocket
 I see the Debug Log is :
  SEND
 destination:/topic/chat.general
 content-length:6
 你好
 the content-length is correct , but I didn't receive any message .
 after a while , the Debug Log show me :
  ERROR
 message:Expected null terminator after 6 content bytes
 Whoops! Lost connection to ws://localhost:61623/



--
This message was sent by Atlassian JIRA
(v6.2#6252)

[jira] [Commented] (APLO-354) Giving Topic based authorization to user groups using access_rule

2014-04-18 Thread Hiram Chirino (JIRA)


[ 
https://issues.apache.org/jira/browse/APLO-354?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13974018#comment-13974018
 ] 

Hiram Chirino commented on APLO-354:


Using openwire?

 Giving Topic based authorization to user groups  using access_rule 
 ---

 Key: APLO-354
 URL: https://issues.apache.org/jira/browse/APLO-354
 Project: ActiveMQ Apollo
  Issue Type: Question
Affects Versions: 1.4
 Environment: Ubuntu,Java
Reporter: Harikrishnan P
Priority: Critical

 Using Apollo 1.4 broker for enabling topic based authorization. Specified 
 access_rule inside virtual host like this,
 access_rule allow=guests action=receive,consume kind=topic queue 
 id=app1.*/
 But its not possible to subscribe from topic app1.*(its showing 
 authorization error saying that user is authorized to subscribe from this 
 TempQueue). But if the id is replaced by a wildcard ,* then the user group 
 can subscribe from any topic. 
 Please help how to authorize the group to subscribe from a particular a 
 particular topic.



--
This message was sent by Atlassian JIRA
(v6.2#6252)

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - April 2014

2014-04-08 Thread Hiram Chirino (Confluence)















  


Hiram Chirino created a page:
 


Apache ActiveMQ Board Report - April 2014   





TLP Description:Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.
Community:* The development and user lists continue to stay active. * The Debate over the inclusion of the hawt.io web console in the ActiveMQ 5.9 release had been resolved. It has been removed in the 5.9.1 release and the upcoming 5.10. 
Development:* An ActiveMQ 5.10 release is being prepared.
Trademark / Branding Status:* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies* Documentation and readme files will also be reviewed for compliance
Releases:
* Apache ActiveMQ 5.9.1 - 4/4/14 * Apache Apollo 1.7 - 3/10/14 





 View Online   Like  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

[2/2] git commit: Implements AMQ-5123: Optionally support encrypted passwords in ActiveMQ users.properties file.

2014-03-27 Thread chirino

Implements AMQ-5123: Optionally support encrypted passwords in ActiveMQ 
users.properties file.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5da7ab3c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5da7ab3c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5da7ab3c

Branch: refs/heads/trunk
Commit: 5da7ab3c0ee027a29c328e48614ffe1a69401577
Parents: bc47020
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Mar 27 13:10:28 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Mar 27 13:10:28 2014 -0400

--
 .../console/command/DecryptCommand.java |  6 ++-
 .../console/command/EncryptCommand.java |  6 ++-
 .../activemq/console/command/ShellCommand.java  | 15 +-
 activemq-jaas/pom.xml   |  5 ++
 .../apache/activemq/jaas/EncryptionSupport.java | 52 
 .../activemq/jaas/PrincipalProperties.java  |  4 ++
 6 files changed, 84 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/5da7ab3c/activemq-console/src/main/java/org/apache/activemq/console/command/DecryptCommand.java
--
diff --git 
a/activemq-console/src/main/java/org/apache/activemq/console/command/DecryptCommand.java
 
b/activemq-console/src/main/java/org/apache/activemq/console/command/DecryptCommand.java
index 6ba22d3..6757786 100644
--- 
a/activemq-console/src/main/java/org/apache/activemq/console/command/DecryptCommand.java
+++ 
b/activemq-console/src/main/java/org/apache/activemq/console/command/DecryptCommand.java
@@ -27,7 +27,8 @@ public class DecryptCommand extends EncryptCommand {
 Description: Decrypts given text.,
 , 
 Encrypt Options:,
---password password  Password to be used by the 
encryptor.,
+--password password  Password to be used by the 
encryptor.  Defaults to,
+   the value in the 
ACTIVEMQ_ENCRYPTION_PASSWORD env variable.,
 --input inputText to be encrypted.,
 --version  Display the version information.,
 -h,-?,--help   Display the stop broker help 
information.,
@@ -46,6 +47,9 @@ public class DecryptCommand extends EncryptCommand {
 
 @Override
 protected void runTask(ListString tokens) throws Exception {
+if( password == null ) {
+password = System.getenv(ACTIVEMQ_ENCRYPTION_PASSWORD);
+}
 if (password == null || input == null) {
 context.printException(new IllegalArgumentException(input and 
password parameters are mandatory));
 return;

http://git-wip-us.apache.org/repos/asf/activemq/blob/5da7ab3c/activemq-console/src/main/java/org/apache/activemq/console/command/EncryptCommand.java
--
diff --git 
a/activemq-console/src/main/java/org/apache/activemq/console/command/EncryptCommand.java
 
b/activemq-console/src/main/java/org/apache/activemq/console/command/EncryptCommand.java
index 6d8172d..ce61ee0 100644
--- 
a/activemq-console/src/main/java/org/apache/activemq/console/command/EncryptCommand.java
+++ 
b/activemq-console/src/main/java/org/apache/activemq/console/command/EncryptCommand.java
@@ -27,7 +27,8 @@ public class EncryptCommand extends AbstractCommand {
 Description: Encrypts given text.,
 , 
 Encrypt Options:,
---password password  Password to be used by the 
encryptor.,
+--password password  Password to be used by the 
encryptor.  Defaults to,
+   the value in the 
ACTIVEMQ_ENCRYPTION_PASSWORD env variable.,
 --input inputText to be encrypted.,
 --version  Display the version information.,
 -h,-?,--help   Display the stop broker help 
information.,
@@ -55,6 +56,9 @@ public class EncryptCommand extends AbstractCommand {
 
 @Override
 protected void runTask(ListString tokens) throws Exception {
+if( password == null ) {
+password = System.getenv(ACTIVEMQ_ENCRYPTION_PASSWORD);
+}
 if (password == null || input == null) {
 context.printException(new IllegalArgumentException(input and 
password parameters are mandatory));
 return;

http://git-wip-us.apache.org/repos/asf/activemq/blob/5da7ab3c/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
--
diff --git 
a/activemq-console/src/main/java/org/apache

git commit: Fixes AMQ-5115: LevelDB sync=true is not being honored.

2014-03-21 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk 2ccc34954 - db321727c


Fixes AMQ-5115: LevelDB sync=true is not being honored.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/db321727
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/db321727
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/db321727

Branch: refs/heads/trunk
Commit: db321727c9d68156cd82d92b74f3752cc118c0cd
Parents: 2ccc349
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Fri Mar 21 12:54:55 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Fri Mar 21 12:54:55 2014 -0400

--
 .../scala/org/apache/activemq/leveldb/RecordLog.scala | 14 --
 .../leveldb/replicated/MasterLevelDBStore.scala   |  1 +
 2 files changed, 5 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/db321727/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
index 08f18a7..daef103 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
@@ -76,8 +76,6 @@ case class RecordLog(directory: File, logSuffix:String) {
   var logSize = 1024 * 1024 * 100L
   var current_appender:LogAppender = _
   var verify_checksums = false
-  var sync = false
-
   val log_infos = new TreeMap[Long, LogInfo]()
 
   object log_mutex
@@ -130,20 +128,16 @@ case class RecordLog(directory: File, logSuffix:String) {
   channel.position(logSize-1)
   channel.write(new Buffer(1).toByteBuffer)
   channel.force(true)
-  if( sync ) {
-channel.position(0)
-  }
+  channel.position(0)
 }
 
 val write_buffer = new 
DataByteArrayOutputStream(BUFFER_SIZE+LOG_HEADER_SIZE)
 
 def force = {
   flush
-  if(sync) {
-max_log_flush_latency {
-  // only need to update the file metadata if the file size changes..
-  channel.force(append_offset  logSize)
-}
+  max_log_flush_latency {
+// only need to update the file metadata if the file size changes..
+channel.force(append_offset  logSize)
   }
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/db321727/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
--
diff --git 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
index 249e0c4..6de5f63 100644
--- 
a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
+++ 
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala
@@ -345,6 +345,7 @@ class MasterLevelDBStore extends LevelDBStore with 
ReplicatedLevelDBStoreTrait {
   val value = new LogWrite
   value.file = position;
   value.offset = offset;
+  value.sync = (syncToMask  SYNC_TO_REMOTE_DISK)!=0
   value.length = fileTransferFrame.length
   value.date = date
   encoded = JsonCodec.encode(value)

git commit: Applying https://github.com/apache/activemq/pull/18.patch to fix AMQ-5116: batchStatment is misspelled for JDBC adaptors.

2014-03-21 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk db321727c - ff409b6f2


Applying https://github.com/apache/activemq/pull/18.patch to fix AMQ-5116: 
batchStatment is misspelled for JDBC adaptors.  

This closes #18 @github.  

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ff409b6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ff409b6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ff409b6f

Branch: refs/heads/trunk
Commit: ff409b6f2c790b15a7b9078fe49be896e71f1006
Parents: db32172
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Fri Mar 21 13:52:41 2014 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Fri Mar 21 13:52:41 2014 -0400

--
 .../store/jdbc/adapter/DefaultJDBCAdapter.java  | 57 ++--
 1 file changed, 41 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ff409b6f/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
--
diff --git 
a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
 
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
index cabe99c..3243048 100755
--- 
a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
+++ 
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
@@ -65,6 +65,8 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 private static final Logger LOG = 
LoggerFactory.getLogger(DefaultJDBCAdapter.class);
 public static final int MAX_ROWS = 
org.apache.activemq.ActiveMQPrefetchPolicy.MAX_PREFETCH_SIZE;
 protected Statements statements;
+private boolean batchStatements = true;
+//This is deprecated and should be removed in a future release
 protected boolean batchStatments = true;
 protected boolean prioritizedMessages;
 protected ReadWriteLock cleanupExclusiveLock = new 
ReentrantReadWriteLock();
@@ -216,7 +218,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 try {
 if (s == null) {
 s = 
c.getConnection().prepareStatement(this.statements.getAddMessageStatement());
-if (this.batchStatments) {
+if (this.batchStatements) {
 c.setAddMessageStatement(s);
 }
 }
@@ -235,14 +237,14 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 } else {
 s.setString(8, null);
 }
-if (this.batchStatments) {
+if (this.batchStatements) {
 s.addBatch();
 } else if (s.executeUpdate() != 1) {
 throw new SQLException(Failed add a message);
 }
 } finally {
 cleanupExclusiveLock.readLock().unlock();
-if (!this.batchStatments) {
+if (!this.batchStatements) {
 if (s != null) {
 s.close();
 }
@@ -259,7 +261,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 try {
 if (s == null) {
 s = 
c.getConnection().prepareStatement(this.statements.getAddMessageStatement());
-if (this.batchStatments) {
+if (this.batchStatements) {
 c.setAddMessageStatement(s);
 }
 }
@@ -269,14 +271,14 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 s.setString(4, destination.getQualifiedName());
 s.setLong(5, expirationTime);
 s.setString(6, messageRef);
-if (this.batchStatments) {
+if (this.batchStatements) {
 s.addBatch();
 } else if (s.executeUpdate() != 1) {
 throw new SQLException(Failed add a message);
 }
 } finally {
 cleanupExclusiveLock.readLock().unlock();
-if (!this.batchStatments) {
+if (!this.batchStatements) {
 s.close();
 }
 }
@@ -352,7 +354,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
 if (s == null) {
 s = c.getConnection().prepareStatement(xid == null ?
 this.statements.getRemoveMessageStatement() : 
this.statements.getUpdateXidFlagStatement());
-if (this.batchStatments) {
+if (this.batchStatements) {
 c.setRemovedMessageStatement(s);
 }
 }
@@ -365,14 +367,14 @@ public class DefaultJDBCAdapter implements JDBCAdapter

svn commit: r901438 [2/25] - in /websites/production/activemq/content/apollo: ./ blog/ blog/releases/ community/ documentation/ documentation/api/apollo-broker/ documentation/api/apollo-broker/META-IN

2014-03-13 Thread chirino

=../download.htmlDownload/a/li

Modified: websites/production/activemq/content/apollo/community/support.html
==
--- websites/production/activemq/content/apollo/community/support.html 
(original)
+++ websites/production/activemq/content/apollo/community/support.html Thu Mar 
13 13:46:26 2014
@@ -31,7 +31,7 @@
 div id=navigation
   div class=wrapper
 ul
-lia href=../index.htmlApollo 1.6/a/li
+lia href=../index.htmlApollo 1.7/a/li
 lia href=developers.htmlDevelopers/a/li
 lia href=index.htmlCommunity/a/li
 lia href=../download.htmlDownload/a/li

Modified: 
websites/production/activemq/content/apollo/documentation/amqp-manual.html
==
--- websites/production/activemq/content/apollo/documentation/amqp-manual.html 
(original)
+++ websites/production/activemq/content/apollo/documentation/amqp-manual.html 
Thu Mar 13 13:46:26 2014
@@ -31,7 +31,7 @@
 div id=navigation
   div class=wrapper
 ul
-lia href=../index.htmlApollo 1.6/a/li
+lia href=../index.htmlApollo 1.7/a/li
 lia href=../community/developers.htmlDevelopers/a/li
 lia href=../community/index.htmlCommunity/a/li
 lia href=../download.htmlDownload/a/li
@@ -40,7 +40,7 @@
 /div
 div id=content
   div class=wrapper
-h1 id = Apollo_1_6_AMQP_Protocol_ManualApollo 1.6 AMQP Protocol Manual/h1
+h1 id = Apollo_1_7_AMQP_Protocol_ManualApollo 1.7 AMQP Protocol Manual/h1
 
 pdiv class=tocul style=list-style:none;
   lia href=#Using_the_AMQP_ProtocolUsing the AMQP Protocol/a/li
@@ -78,7 +78,10 @@ port of 5672 and 5671 for SSL secured AM
 configuration elements to your Apollo config file so that AMQP clients can 
more easily 
 connect to Apollo./p
 
-div class=syntaxdiv class=highlightprespan 
class=ntlt;connector/span span class=naid=/spanspan 
class=squot;amqpquot;/span span class=nabind=/spanspan 
class=squot;tcp://0.0.0.0:5672quot;/spanspan 
class=nt/gt;/span#x000A;span class=ntlt;connector/span span 
class=naid=/spanspan class=squot;amqpsquot;/span span 
class=nabind=/spanspan 
class=squot;ssl://0.0.0.0:5671quot;/spanspan 
class=nt/gt;/span#x000A;/pre/div#x000A;/div
+div class=syntaxpre name='code' class='brush: xml; gutter: false;'code
+lt;connector id=quot;amqpquot; bind=quot;tcp://0.0.0.0:5672quot;/gt;
+lt;connector id=quot;amqpsquot; bind=quot;ssl://0.0.0.0:5671quot;/gt;
+/code/pre/div
 
 h3 id = AMPQ_Protocol_OptionsAMPQ Protocol Options/h3
 
@@ -115,7 +118,11 @@ headers are parsed and interpreted.  The
 
 pExample:/p
 
-div class=syntaxdiv class=highlightprespan 
class=ntlt;connector/span span class=naid=/spanspan 
class=squot;tcpquot;/span span class=nabind=/spanspan 
class=squot;tcp://0.0.0.0:5672quot;/spanspan 
class=ntgt;/span#x000A;  span class=ntlt;amqp/span span 
class=namax_frame_size=/spanspan class=squot;4Mquot;/spanspan 
class=nt/gt;/span#x000A;span 
class=ntlt;/connectorgt;/span#x000A;/pre/div#x000A;/div
+div class=syntaxpre name='code' class='brush: xml; gutter: false;'code
+lt;connector id=quot;tcpquot; bind=quot;tcp://0.0.0.0:5672quot;gt;
+  lt;amqp max_frame_size=quot;4Mquot;/gt;
+lt;/connectorgt;
+/code/pre/div
 
 h3 id = ConnectingConnecting/h3
 

Modified: 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/MANIFEST.MF
==
--- 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/MANIFEST.MF
 (original)
+++ 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/MANIFEST.MF
 Thu Mar 13 13:46:26 2014
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Archiver-Version: Plexus Archiver
 Created-By: Apache Maven
 Built-By: chirino
-Build-Jdk: 1.7.0_07
+Build-Jdk: 1.7.0_45
 Specification-Title: apollo-broker
-Specification-Version: 1.6
+Specification-Version: 1.7
 Specification-Vendor: The Apache Software Foundation
 Implementation-Title: apollo-broker
-Implementation-Version: 1.6
+Implementation-Version: 1.7
 Implementation-Vendor-Id: org.apache.activemq
 Implementation-Vendor: The Apache Software Foundation
 

Modified: 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/maven/org.apache.activemq/apollo-broker/pom.properties
==
--- 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/maven/org.apache.activemq/apollo-broker/pom.properties
 (original)
+++ 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF/maven/org.apache.activemq/apollo-broker/pom.properties
 Thu Mar 13 13:46:26 2014
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 20 13:24:41 EST 2013
-version=1.6
+#Mon Feb 24 20:26:59 EST 2014
+version=1.7
 groupId=org.apache.activemq
 artifactId=apollo-broker

Modified: 
websites/production/activemq/content/apollo/documentation/api/apollo-broker/META-INF

git commit: Applying patch AMQ-5074: MQTT paths with empty levels are not handled correctly.

2014-02-24 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk 2b3c47775 - e7e317dc7


Applying patch AMQ-5074: MQTT paths with empty levels are not handled correctly.

Thanks Dhiraj!

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e7e317dc
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e7e317dc
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e7e317dc

Branch: refs/heads/trunk
Commit: e7e317dc7ed00de26ba905c34debaf38184f497b
Parents: 2b3c477
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 09:05:23 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 09:05:23 2014 -0500

--
 .../activemq/command/ActiveMQDestination.java   |  15 ++-
 .../filter/AnyChildDestinationNode.java |   1 -
 .../activemq/filter/DestinationFilter.java  |  23 
 .../apache/activemq/filter/DestinationMap.java  |   1 -
 .../activemq/filter/DestinationMapNode.java |  17 ++-
 .../filter/PrefixDestinationFilter.java |  12 +-
 .../activemq/transport/mqtt/MQTTTest.java   | 113 ---
 .../activemq/filter/DestinationMapTest.java |  22 +++-
 8 files changed, 148 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e7e317dc/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
 
b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
index 3bd4f25..0cea4e5 100755
--- 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
@@ -283,14 +283,17 @@ public abstract class ActiveMQDestination extends 
JNDIBaseStorable implements Da
 }
 
 ListString l = new ArrayListString();
-StringTokenizer iter = new StringTokenizer(physicalName, 
PATH_SEPERATOR);
-while (iter.hasMoreTokens()) {
-String name = iter.nextToken().trim();
-if (name.length() == 0) {
-continue;
+StringBuilder level = new StringBuilder();
+final char separator = PATH_SEPERATOR.charAt(0);
+for (char c : physicalName.toCharArray()) {
+if (c == separator) {
+l.add(level.toString());
+level.delete(0, level.length());
+} else {
+level.append(c);
 }
-l.add(name);
 }
+l.add(level.toString());
 
 destinationPaths = new String[l.size()];
 l.toArray(destinationPaths);

http://git-wip-us.apache.org/repos/asf/activemq/blob/e7e317dc/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
 
b/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
index cf35ac8..985df79 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/filter/AnyChildDestinationNode.java
@@ -100,7 +100,6 @@ public class AnyChildDestinationNode implements 
DestinationNode {
 return answer;
 }
 
-
 public Collection getChildren() {
 Collection answer = new ArrayList();
 Iterator iter = getChildNodes().iterator();

http://git-wip-us.apache.org/repos/asf/activemq/blob/e7e317dc/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
 
b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
index 34f4b8a..0424524 100755
--- 
a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
@@ -53,7 +53,6 @@ public abstract class DestinationFilter implements 
BooleanExpression {
 return new CompositeDestinationFilter(destination);
 }
 String[] paths = DestinationPath.getDestinationPaths(destination);
-paths = rationalizePaths(paths);
 int idx = paths.length - 1;
 if (idx = 0) {
 String lastPath = paths[idx];
@@ -73,26 +72,4 @@ public abstract class DestinationFilter implements 
BooleanExpression {
 return new SimpleDestinationFilter(destination);
 }
 
-/**
- * Look

[2/4] git commit: More work improving the openwire generator.

2014-02-24 Thread chirino

More work improving the openwire generator.


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/bb366a22
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/bb366a22
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/bb366a22

Branch: refs/heads/trunk
Commit: bb366a2217dabef2f8d2a38646c193ada91fe146
Parents: 22025b7
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 18:53:33 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 18:54:07 2014 -0500

--
 .../apollo/openwire/generator/ApolloMarshallingGenerator.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/bb366a22/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
--
diff --git 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
index 36570ec..6467076 100644
--- 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
+++ 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
@@ -298,10 +298,10 @@ class ApolloMarshallingGenerator extends 
MultiSourceGenerator {
   protected def generateFactory(out: PrintWriter): Unit = {
 generateLicence(out)
 out.println()
-out.println(package org.apache.activemq.apollo.openwire.codec.v + 
getOpenwireVersion + ;)
+out.println(package +packagePrefix+.v + getOpenwireVersion + ;)
 out.println()
-out.println(import 
org.apache.activemq.apollo.openwire.codec.DataStreamMarshaller;)
-out.println(import 
org.apache.activemq.apollo.openwire.codec.OpenWireFormat;)
+out.println(import +packagePrefix+.DataStreamMarshaller;)
+out.println(import +packagePrefix+.OpenWireFormat;)
 out.println()
 out.println(/**)
 out.println( * MarshallerFactory for Open Wire Format.)

[3/4] git commit: Support configuring the package names in the openwire generator standalone app.

2014-02-24 Thread chirino

Support configuring the package names in the openwire generator standalone app.


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/22025b7c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/22025b7c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/22025b7c

Branch: refs/heads/trunk
Commit: 22025b7cfdd3385103c09203985d736c31366355
Parents: 1637f4b
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 09:45:46 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 18:54:07 2014 -0500

--
 .../activemq/apollo/openwire/generator/GeneratorTask.scala | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/22025b7c/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
--
diff --git 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
index 62017ea..d2d0cf9 100644
--- 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
+++ 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/GeneratorTask.scala
@@ -49,6 +49,12 @@ object GeneratorTask {
 if (args.length  2) {
   generator.targetDir = new File(args(2))
 }
+if (args.length  3) {
+  generator.packagePrefix = args(3)
+}
+if (args.length  4) {
+  generator.commandPackage = args(4)
+}
 generator.execute
   }
 }

git commit: Fixes compile error.

2014-02-24 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 861d918d0 - 85a7f85ba


Fixes compile error.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/85a7f85b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/85a7f85b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/85a7f85b

Branch: refs/heads/trunk
Commit: 85a7f85ba16716287d8b8c724b7c327e011b538f
Parents: 861d918
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 19:10:15 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 19:10:15 2014 -0500

--
 apollo-website/ext/Website.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/85a7f85b/apollo-website/ext/Website.scala
--
diff --git a/apollo-website/ext/Website.scala b/apollo-website/ext/Website.scala
index 2f609e4..418a7e7 100644
--- a/apollo-website/ext/Website.scala
+++ b/apollo-website/ext/Website.scala
@@ -38,7 +38,7 @@ object Website {
   val project_snapshot_version= 99-trunk-SNAPSHOT
   val project_versions = List(
 project_version,
-   1.6
+1.6,
 1.5,
 1.4,
 1.3,

git commit: [maven-release-plugin] prepare release apollo-project-1.7

2014-02-24 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 85a7f85ba - 4bceaefe7


[maven-release-plugin] prepare release apollo-project-1.7


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/4bceaefe
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/4bceaefe
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/4bceaefe

Branch: refs/heads/trunk
Commit: 4bceaefe7696c67fadc017e55c94ae0cf43d6d09
Parents: 85a7f85
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 19:18:46 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 19:18:46 2014 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  2 +-
 20 files changed, 111 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/4bceaefe/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 8fc1283..29ea472 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/4bceaefe/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 06ab8f2..51df89d 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version99-trunk-SNAPSHOT/version
+version1.7/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version99-trunk-SNAPSHOT/version
+  version1.7/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId

Git Push Summary

2014-02-24 Thread chirino

Repository: activemq-apollo
Updated Tags:  refs/tags/apollo-project-1.7 [deleted] 6bddb9a61

git commit: [maven-release-plugin] prepare for next development iteration

2014-02-24 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 4bceaefe7 - 3ab49df79


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/3ab49df7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/3ab49df7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/3ab49df7

Branch: refs/heads/trunk
Commit: 3ab49df798a638898bad13b9c456d275c275ad6a
Parents: 4bceaef
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Mon Feb 24 20:22:37 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Mon Feb 24 20:22:37 2014 -0500

--
 apollo-amqp/pom.xml   | 16 
 apollo-bdb/pom.xml| 12 ++--
 apollo-boot/pom.xml   |  4 ++--
 apollo-broker/pom.xml | 10 +-
 apollo-cli/pom.xml| 22 +++---
 apollo-distro/pom.xml | 24 
 apollo-dto/pom.xml|  6 +++---
 apollo-jmx/pom.xml| 12 ++--
 apollo-leveldb/pom.xml| 12 ++--
 apollo-mqtt/pom.xml   | 18 +-
 apollo-openwire-generator/pom.xml |  4 ++--
 apollo-openwire/pom.xml   | 16 
 apollo-scala/pom.xml  |  4 ++--
 apollo-selector/pom.xml   |  4 ++--
 apollo-stomp/pom.xml  | 16 
 apollo-util/pom.xml   |  4 ++--
 apollo-war/pom.xml| 24 
 apollo-web/pom.xml| 10 +-
 apollo-website/pom.xml|  2 +-
 pom.xml   |  2 +-
 20 files changed, 111 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/3ab49df7/apollo-amqp/pom.xml
--
diff --git a/apollo-amqp/pom.xml b/apollo-amqp/pom.xml
index 29ea472..8fc1283 100644
--- a/apollo-amqp/pom.xml
+++ b/apollo-amqp/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-amqp/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
 
   name${project.artifactId}/name
@@ -42,7 +42,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
 /dependency
 dependency
   groupIdorg.apache.qpid/groupId
@@ -52,7 +52,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-web/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   optionaltrue/optional
 /dependency
 dependency
@@ -74,14 +74,14 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-util/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   typetest-jar/type
   scopetest/scope
 /dependency
@@ -89,13 +89,13 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-leveldb/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   scopetest/scope
 /dependency
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/3ab49df7/apollo-bdb/pom.xml
--
diff --git a/apollo-bdb/pom.xml b/apollo-bdb/pom.xml
index 51df89d..06ab8f2 100644
--- a/apollo-bdb/pom.xml
+++ b/apollo-bdb/pom.xml
@@ -22,13 +22,13 @@
   parent
 groupIdorg.apache.activemq/groupId
 artifactIdapollo-scala/artifactId
-version1.7/version
+version99-trunk-SNAPSHOT/version
 relativePath../apollo-scala/relativePath
   /parent
 
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-bdb/artifactId
-  version1.7/version
+  version99-trunk-SNAPSHOT/version
   !-- packagingbundle/packaging --
   name${project.artifactId}/name
   descriptionBDB based message storage/description
@@ -38,7 +38,7 @@
 dependency
   groupIdorg.apache.activemq/groupId
   artifactIdapollo-broker/artifactId

Git Push Summary

2014-02-24 Thread chirino

Repository: activemq-apollo
Updated Tags:  refs/tags/apollo-project-1.7 [created] 46c2deb2d

svn commit: r899084 [6/6] - in /websites/production/activemq/content/apollo/versions/1.7/website: ./ blog/ blog/releases/ community/ documentation/ documentation/api/apollo-broker/ documentation/api/a

2014-02-24 Thread chirino

Modified: 
websites/production/activemq/content/apollo/versions/1.7/website/documentation/management-api.html
==
--- 
websites/production/activemq/content/apollo/versions/1.7/website/documentation/management-api.html
 (original)
+++ 
websites/production/activemq/content/apollo/versions/1.7/website/documentation/management-api.html
 Tue Feb 25 01:54:52 2014
@@ -54,7 +54,7 @@
 div id=navigation
   div class=wrapper
 ul
-lia href=../index.htmlApollo 1.6/a/li
+lia href=../index.htmlApollo 1.7/a/li
 lia href=../community/developers.htmlDevelopers/a/li
 lia href=../community/index.htmlCommunity/a/li
 lia href=../download.htmlDownload/a/li
@@ -63,7 +63,7 @@
 /div
 div id=content
   div class=wrapper
-h1 id = Apollo_1_6_Management_APIApollo 1.6 Management API/h1
+h1 id = Apollo_1_7_Management_APIApollo 1.7 Management API/h1
 
 pdiv class=tocul style=list-style:none;
   lia href=#OverviewOverview/a/li
@@ -307,7 +307,7 @@ parameter to define the order in which t
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html;
 BrokerStatusDTO
   /a
 /code
@@ -324,7 +324,7 @@ parameter to define the order in which t
   quot;idquot;: quot;defaultquot;,
   quot;statequot;: quot;STARTEDquot;,
   quot;state_sincequot;: 1314573353753,
-  quot;versionquot;: quot;1.6quot;,
+  quot;versionquot;: quot;1.7quot;,
   quot;jvm_metricsquot;: {
 quot;heap_memoryquot;: {
   quot;usedquot;: 22165160,
@@ -383,7 +383,7 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
 AggregateDestMetricsDTO
   /a
 /code
@@ -446,7 +446,7 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
 AggregateDestMetricsDTO
   /a
 /code
@@ -473,7 +473,7 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
 AggregateDestMetricsDTO
   /a
 /code
@@ -500,7 +500,7 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html;
 AggregateDestMetricsDTO
   /a
 /code
@@ -539,11 +539,11 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html;
 DataPageDTO
   /a
   paging
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html;
 VirtualHostStatusDTO
   /a
   div/div
@@ -571,7 +571,7 @@ included n the result./p
 code
   200
   and/and
-  a 
href=http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html;
+  a 
href=http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html;
 VirtualHostStatusDTO
   /a
 /code
@@ -615,7 +615,7 @@ included n the result./p
 code
   200
   and/and
-  a

git commit: Upgrade to latest releases of mqt-client and hawtbuf to fix some MQTT issues.

2014-02-21 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk c6fe94ec0 - 546714550


Upgrade to latest releases of mqt-client and hawtbuf to fix some MQTT issues.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/54671455
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/54671455
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/54671455

Branch: refs/heads/trunk
Commit: 546714550fa08e9ab910f7bc203d767820507bb9
Parents: c6fe94e
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Fri Feb 21 08:15:44 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Fri Feb 21 08:15:44 2014 -0500

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/54671455/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e09f2de..35f7da2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 ftpserver-version1.0.6/ftpserver-version
 geronimo-version1.0/geronimo-version
 hadoop-version1.0.0/hadoop-version
-hawtbuf-version1.9/hawtbuf-version
+hawtbuf-version1.10/hawtbuf-version
 hawtdispatch-version1.20/hawtdispatch-version
 howl-version0.1.8/howl-version
 hsqldb-version1.8.0.12/hsqldb-version
@@ -90,7 +90,7 @@
 leveldb-version0.6/leveldb-version
 leveldbjni-version1.8/leveldbjni-version
 log4j-version1.2.17/log4j-version
-mqtt-client-version1.8/mqtt-client-version
+mqtt-client-version1.9/mqtt-client-version
 openjpa-version1.2.0/openjpa-version
 org-apache-derby-version10.10.1.1/org-apache-derby-version
 org.osgi.core-version4.3.1/org.osgi.core-version

git commit: Implements AMQ-5072: Support configuring a different directory for the KahaDB index files.

2014-02-21 Thread chirino

Repository: activemq
Updated Branches:
  refs/heads/trunk 546714550 - 232b8c51e


Implements AMQ-5072: Support configuring a different directory for the KahaDB 
index files.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/232b8c51
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/232b8c51
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/232b8c51

Branch: refs/heads/trunk
Commit: 232b8c51e97903a9a4da64633d3a80a0afaf250b
Parents: 5467145
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Fri Feb 21 11:08:27 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Fri Feb 21 11:08:27 2014 -0500

--
 .../activemq/store/kahadb/MessageDatabase.java   | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/232b8c51/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 2d2dd55..4775f1b 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -224,6 +224,7 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 
 protected boolean deleteAllMessages;
 protected File directory = DEFAULT_DIRECTORY;
+protected File indexDirectory = null;
 protected Thread checkpointThread;
 protected boolean enableJournalDiskSyncs=true;
 protected boolean archiveDataLogs;
@@ -2385,8 +2386,12 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 // Initialization related implementation methods.
 // /
 
-private PageFile createPageFile() {
-PageFile index = new PageFile(directory, db);
+private PageFile createPageFile() throws IOException {
+if( indexDirectory == null ) {
+indexDirectory = directory;
+}
+IOHelper.mkdirs(indexDirectory);
+PageFile index = new PageFile(indexDirectory, db);
 index.setEnableWriteThread(isEnableIndexWriteAsync());
 index.setWriteBatchSize(getIndexWriteBatchSize());
 index.setPageCacheSize(indexCacheSize);
@@ -2503,7 +2508,7 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 return this.metadata.producerSequenceIdTracker.getAuditDepth();
 }
 
-public PageFile getPageFile() {
+public PageFile getPageFile() throws IOException {
 if (pageFile == null) {
 pageFile = createPageFile();
 }
@@ -3057,4 +3062,12 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 }
 }
 }
+
+public File getIndexDirectory() {
+return indexDirectory;
+}
+
+public void setIndexDirectory(File indexDirectory) {
+this.indexDirectory = indexDirectory;
+}
 }

[CONF] Apache ActiveMQ KahaDB

2014-02-21 Thread Hiram Chirino (Confluence)















  


Hiram Chirino edited the page:
 


KahaDB   






KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimised for fast persistence and is the the default storage mechanism from ActiveMQ 5.4 onwards. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the amq message store AMQ Message Store.
Configuration
You can configure ActiveMQ to use KahaDB for its persistence adapter - like below:



 Code Block




 

 broker brokerName=broker ... 
persistenceAdapter
  kahaDB directory=activemq-data journalMaxFileLength=32mb/
/persistenceAdapter
...
 /broker

 



...




 property name 
 default value 
 Comments 


 directory 
 activemq-data 
 the path to the directory to use to store the message store data and log files 


IndexDirectory

  If set, configures where the KahaDB index files will be stored. If not set, the index files are stored in the directory specified by the 'directory' attribute.  



 Note




Available as of ActiveMQ 5.10

git commit: Support customizing the package names generated by the openwire generator so that the plugin can be re-used by other projects that need to generate openwire codecs.

2014-02-21 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk b1b19fdda - 4cbe349ac


Support customizing the package names generated by the openwire generator so 
that the plugin can be re-used by other projects that need to generate openwire 
codecs.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/4cbe349a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/4cbe349a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/4cbe349a

Branch: refs/heads/trunk
Commit: 4cbe349ac657590d99d5051c3a2598b17666d9a3
Parents: b1b19fd
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Fri Feb 21 11:58:45 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Fri Feb 21 11:58:45 2014 -0500

--
 .../generator/ApolloMarshallingGenerator.scala  | 32 ++--
 .../openwire/generator/GeneratorTask.scala  | 13 
 2 files changed, 35 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/4cbe349a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
--
diff --git 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
index ade816a..36570ec 100644
--- 
a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
+++ 
b/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire/generator/ApolloMarshallingGenerator.scala
@@ -31,6 +31,7 @@ import org.apache.tools.ant.Project
 import org.apache.tools.ant.taskdefs.FixCRLF
 import org.apache.tools.ant.taskdefs.FixCRLF.CrLf
 import org.codehaus.jam._
+import scala.beans.BeanProperty
 
 /**
  * p
@@ -39,9 +40,24 @@ import org.codehaus.jam._
  * @author a href=http://hiramchirino.com;Hiram Chirino/a
  */
 class ApolloMarshallingGenerator extends MultiSourceGenerator {
+
+  protected var concreteClasses: List[JClass] = new ArrayList[JClass]
+  protected var factoryFile: File = null
+  protected var factoryFileName: String = MarshallerFactory
+  protected var indent: String = 
+  protected var targetDir: String = src/main/java
+
+  @BeanProperty
+  var commandPackage = org.apache.activemq.apollo.openwire.command
+
+  @BeanProperty
+  var packagePrefix = org.apache.activemq.apollo.openwire.codec
+
+  def packagePrefixPath = packagePrefix.replace('.', '/');
+
   override def run: AnyRef = {
 if (destDir == null) {
-  destDir = new File(targetDir + 
/org/apache/activemq/apollo/openwire/codec/v + getOpenwireVersion)
+  destDir = new File(targetDir + 
/+packagePrefixPath+/v+getOpenwireVersion)
 }
 var answer: AnyRef = super.run
 processFactory
@@ -81,14 +97,14 @@ class ApolloMarshallingGenerator extends 
MultiSourceGenerator {
   protected def generateFile(out: PrintWriter): Unit = {
 generateLicence(out)
 out.println()
-out.println(package org.apache.activemq.apollo.openwire.codec.v + 
getOpenwireVersion + ;)
+out.println(package +packagePrefix +.v+ getOpenwireVersion + ;)
 out.println()
 out.println(import org.fusesource.hawtbuf.DataByteArrayInputStream;)
 out.println(import org.fusesource.hawtbuf.DataByteArrayOutputStream;)
 out.println(import java.io.IOException;)
 out.println()
-out.println(import org.apache.activemq.apollo.openwire.codec.*;)
-out.println(import org.apache.activemq.apollo.openwire.command.*;)
+out.println(import +packagePrefix+.*;)
+out.println(import +commandPackage+.*;)
 
 out.println()
 out.println()
@@ -669,7 +685,7 @@ class ApolloMarshallingGenerator extends 
MultiSourceGenerator {
   override def isMarshallAware(j: JClass): Boolean = {
 if (filePostFix.endsWith(java)) {
   j.getInterfaces.foreach { x=
-if (x.getQualifiedName == 
org.apache.activemq.apollo.openwire.command.MarshallAware) {
+if (x.getQualifiedName == commandPackage+.MarshallAware) {
   return true
 }
   }
@@ -735,10 +751,6 @@ class ApolloMarshallingGenerator extends 
MultiSourceGenerator {
 this.targetDir = sourceDir
   }
 
-  protected var concreteClasses: List[JClass] = new ArrayList[JClass]
-  protected var factoryFile: File = null
-  protected var factoryFileName: String = MarshallerFactory
-  protected var indent: String = 
-  protected var targetDir: String = src/main/java
+
 }
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/4cbe349a/apollo-openwire-generator/src/main/scala/org/apache/activemq/apollo/openwire

[jira] [Commented] (APLO-351) out of memory


[ 
https://issues.apache.org/jira/browse/APLO-351?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13906941#comment-13906941
 ] 

Hiram Chirino commented on APLO-351:


80,000 in 3G of memory is more clients than I would expect.  I suspect your not 
running any load on on those clients.  Once you start running messaging load on 
the broker, it's going to need even more memory.

'-Xms6G -Xms1G ' does not seem valid to me.  Did you mean to do ' -Xmx6G 
-Xms1G'?  In any case if the apollo-broker-service fails to startup a broker, 
try starting the broker in the foreground using 'apollo-broker run'.  That way 
is you can see if the JVM outputs any errors to the console screen.

 out of memory
 -

 Key: APLO-351
 URL: https://issues.apache.org/jira/browse/APLO-351
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-broker
Affects Versions: 1.6
Reporter: oscar
 Attachments: 18AADBAA-5058-4344-AAC0-D1C51891C194.png, 
 37DF6BCA-9707-4583-943D-C0D0B6408FDD.png, 
 8ADF01D2-47BB-4666-8D40-145BBC55B593.png


 use apollo + mqtt to publish message,but when have 100,000 clients, the 
 apollo.log prints:
 2014-02-18 19:31:28,475 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b747fc
 2014-02-18 19:31:28,475 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b747fd
 2014-02-18 19:31:35,422 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b747fe
 2014-02-18 19:31:41,703 | WARN  | java.lang.OutOfMemoryError: GC overhead 
 limit exceeded | 1b747ff
 2014-02-18 19:31:54,934 | WARN  | java.lang.OutOfMemoryError: GC overhead 
 limit exceeded | 1b74800
 2014-02-18 19:32:07,494 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b74803
 2014-02-18 19:32:01,211 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b74802
 2014-02-18 19:32:01,211 | WARN  | java.lang.OutOfMemoryError: Java heap space 
 | 1b74801
 use export JVM_FLAGS=-server -Xmx3G -Xms1G in apollo-service
 my system is linux (CentOS 6.5),32G memory,8 cpus



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

git commit: Allow MQTT 3.1.1 clients to connect.

2014-02-20 Thread chirino

Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 2b3b5ccb9 - d439ba558


Allow MQTT 3.1.1 clients to connect.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/d439ba55
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/d439ba55
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/d439ba55

Branch: refs/heads/trunk
Commit: d439ba558b9036e3a6ac87254b1dd034f5d06530
Parents: 2b3b5cc
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Thu Feb 20 09:47:57 2014 -0500
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Thu Feb 20 09:47:57 2014 -0500

--
 .../activemq/apollo/mqtt/MqttProtocolCodecFactory.java  |  8 ++--
 .../activemq/apollo/mqtt/MqttProtocolHandler.java   | 12 +---
 2 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/d439ba55/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolCodecFactory.java
--
diff --git 
a/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolCodecFactory.java
 
b/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolCodecFactory.java
index a164c40..ffaebe5 100644
--- 
a/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolCodecFactory.java
+++ 
b/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolCodecFactory.java
@@ -39,7 +39,8 @@ public class MqttProtocolCodecFactory implements 
ProtocolCodecFactory.Provider {
 //
 static final String id = mqtt;
 static final Buffer HEAD_MAGIC = new Buffer(new byte []{ 0x10 });
-static final Buffer TAIL_MAGIC = new Buffer(new byte []{ 0x00, 0x06, 'M', 
'Q', 'I', 's', 'd', 'p'});
+static final Buffer MQTT31_TAIL_MAGIC = new Buffer(new byte []{ 0x00, 
0x06, 'M', 'Q', 'I', 's', 'd', 'p'});
+static final Buffer MQTT311_TAIL_MAGIC = new Buffer(new byte []{ 0x00, 
0x04, 'M', 'Q', 'T', 'T'});
 
 @Override
 public String id() {
@@ -68,7 +69,10 @@ public class MqttProtocolCodecFactory implements 
ProtocolCodecFactory.Provider {
 if (header.length  10) {
   return false;
 } else {
-  return header.startsWith(HEAD_MAGIC)  header.indexOf(TAIL_MAGIC, 
2)  6;
+  return header.startsWith(HEAD_MAGIC)  (
+  header.indexOf(MQTT31_TAIL_MAGIC, 2)  6 ||
+  header.indexOf(MQTT311_TAIL_MAGIC, 2)  6
+  );
 }
 }
 

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/d439ba55/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.java
--
diff --git 
a/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.java
 
b/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.java
index e9714be..58ec899 100644
--- 
a/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.java
+++ 
b/apollo-mqtt/src/main/java/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.java
@@ -426,9 +426,15 @@ public class MqttProtocolHandler extends 
AbstractProtocolHandler {
 
 final CONNACK connack = new CONNACK();
 
-if (connect_message.version() != 3) {
-
connack.code(CONNACK.Code.CONNECTION_REFUSED_UNACCEPTED_PROTOCOL_VERSION);
-die(connack, Unsupported protocol version:  + 
connect_message.version());
+switch(connect_message.version()) {
+case 3:case 4: break;
+default:
+
connack.code(CONNACK.Code.CONNECTION_REFUSED_UNACCEPTED_PROTOCOL_VERSION);
+die(connack, Unsupported protocol version:  + 
connect_message.version());
+}
+
+if( (connect_message.clientId() == null || 
connect_message.clientId().length==0)  !connect_message.cleanSession() ) {
+die(connack, A clean session must be requested when no client id 
is provided.);
 }
 
 UTF8Buffer client_id = connect_message.clientId();

[jira] [Resolved] (APLO-331) MQTT Websocket problem


 [ 
https://issues.apache.org/jira/browse/APLO-331?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino resolved APLO-331.


   Resolution: Incomplete
Fix Version/s: (was: 1.7)

Please reopen if you can provide us more info.

 MQTT Websocket problem
 --

 Key: APLO-331
 URL: https://issues.apache.org/jira/browse/APLO-331
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-mqtt
Affects Versions: 1.6, 1.7
 Environment: OS: Ubuntu 12.04, JDK: 1.6.0_32, Clients: FF 22.0 Chrome 
 28.0.1500.71, JS library: Paho MQTT JS Client 
 (http://git.eclipse.org/c/paho/org.eclipse.paho.mqtt.javascript.git/)
Reporter: Ayhan Alkan
Priority: Blocker

 I get AMQJS0016E Invalid MQTT message type 0. message while trying to 
 connect MQTT broker via ws probably due to  getting \u0002\u\u0004 
 stream.  The same script works well with Active MQ 1.9.0-SNAPSHOT.  JS 
 library stack trace is as follows:
 0: Client.startTrace
 1:   2013-07-21T06:01:48.018Z
 2:   0.0.0.0
 3: Client.connect
 4:   
 {userName:admin,password:**,cleanSession:true,keepAliveInterval:60}
 5: undefined
 6:   false
 7: Client._socket_send
 8:   
 {type:1,userName:admin,password:**,cleanSession:true,keepAliveInterval:60,clientId:client123}
 9: Client._on_socket_message
 10:\u0002\u\u0004
 11: Client._on_socket_message
 12:   {type:0}
 13: Client._disconnected
 14:   16
 15:   AMQJS0016E Invalid MQTT message type 0.
 16: Client.getTraceLog
 17:   2013-07-21T06:01:58.006Z
 18: Client.getTraceLog in flight messages
 19: undefined



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

[jira] [Resolved] (APLO-339) java.nio.channels.CancelledKeyException


 [ 
https://issues.apache.org/jira/browse/APLO-339?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino resolved APLO-339.


Resolution: Fixed

The upgrade to hawtdispatch 1.20 should fix this issue.

 java.nio.channels.CancelledKeyException 
 

 Key: APLO-339
 URL: https://issues.apache.org/jira/browse/APLO-339
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-broker, apollo-stomp
Affects Versions: 1.6
 Environment: Windows 7, Windows Server 2008, .NET, Delphi XE2 via 
 Habari stomp
Reporter: Vladislav Podlin
Assignee: Hiram Chirino
 Fix For: 1.7


 Hello!
 We use Apollo message broker for communication between different platforms 
 (.NET, Delphi). Time after time an exception occurs which disables handling 
 of several messages. 
 Some other messages are still working.
 java.nio.channels.CancelledKeyException | 141ef86151b
 It works again after restarting of the broker service.
 What can be the reason of this exception? How to deal with this?  



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

[jira] [Updated] (APLO-318) Large transactions sending persistent messages hang.


 [ 
https://issues.apache.org/jira/browse/APLO-318?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-318:
---

Fix Version/s: (was: 1.7)
   1.8

 Large transactions sending persistent messages hang.
 

 Key: APLO-318
 URL: https://issues.apache.org/jira/browse/APLO-318
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-openwire, apollo-stomp
Reporter: Hiram Chirino
Assignee: Hiram Chirino
 Fix For: 1.8






--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

[jira] [Updated] (APLO-293) Apollo should try to recover messages from a corrupted store


 [ 
https://issues.apache.org/jira/browse/APLO-293?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-293:
---

Fix Version/s: (was: 1.7)
   1.8

 Apollo should try to recover messages from a corrupted store
 

 Key: APLO-293
 URL: https://issues.apache.org/jira/browse/APLO-293
 Project: ActiveMQ Apollo
  Issue Type: Bug
 Environment: apollo-99-trunk-20130202.135855-180
Reporter: Lionel Cons
Assignee: Hiram Chirino
 Fix For: 1.8


 Due to other bugs (mainly APLO-257 but not only), we sometimes have to kill 
 Apollo the hard way as it would not stop gracefully.
 This almost always leaves the LevelDB store corrupted. When (re)starting, we 
 see messages like:
 2013-02-03 12:47:13,099 | WARN  | DB operation failed. (entering recovery 
 mode): org.iq80.leveldb.DBException: IO error: 
 /var/lib/apollo/data/dirty.index/001869.sst: No such file or directory | 
 13c9fe18242
 (see also APLO-282)
 At this point Apollo hangs. The only solution is to kill it once more and 
 completely destroy the message store, loosing all messages :-(
 Could Apollo try to recover at least some messages in these situations 
 instead of hanging during startup?



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

[jira] [Updated] (APLO-307) Athorisation fails for temp queues if using other than default virtual host id


 [ 
https://issues.apache.org/jira/browse/APLO-307?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Hiram Chirino updated APLO-307:
---

Fix Version/s: (was: 1.7)
   1.8

 Athorisation fails for temp queues if using other than default virtual host id
 --

 Key: APLO-307
 URL: https://issues.apache.org/jira/browse/APLO-307
 Project: ActiveMQ Apollo
  Issue Type: Bug
  Components: apollo-broker
Affects Versions: 1.6
 Environment: Unix (OS X)
Reporter: Tamas Blummer
Priority: Minor
 Fix For: 1.8


 STOMP Subscription to freshly created temp queue from same client fails with 
 error message:
 Not authorized to receive from the temporary destination. Principals=...
 Workaround:
 Use  virtual_host id=default in apollo.xml



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

[jira] [Updated] (APLO-225) Openwire Producer Flow control tests failing