date:20150522

Git Push Summary

2015-05-22 Thread andytaylor

Repository: activemq
Updated Branches:
  refs/heads/apache_master [deleted] dd7af6753

activemq git commit: AMQ-5793 - fix swissarmy knife example

2015-05-22 Thread andytaylor

Repository: activemq
Updated Branches:
  refs/heads/apache_master [created] dd7af6753


AMQ-5793 - fix swissarmy knife example

https://issues.apache.org/jira/browse/AMQ-5793


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

Branch: refs/heads/apache_master
Commit: dd7af675304b9087e9f421328f206f1cd1a1140b
Parents: 5ee9a34
Author: Andy Taylor andy.tayl...@gmail.com
Authored: Fri May 22 08:23:09 2015 +0100
Committer: Andy Taylor andy.tayl...@gmail.com
Committed: Fri May 22 08:44:57 2015 +0100

--
 assembly/src/release/examples/openwire/swissarmy/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/dd7af675/assembly/src/release/examples/openwire/swissarmy/build.xml
--
diff --git a/assembly/src/release/examples/openwire/swissarmy/build.xml 
b/assembly/src/release/examples/openwire/swissarmy/build.xml
index e5657eb..3214d32 100755
--- a/assembly/src/release/examples/openwire/swissarmy/build.xml
+++ b/assembly/src/release/examples/openwire/swissarmy/build.xml
@@ -18,7 +18,7 @@
 project name=Inbox default=help basedir=.
 
 property name=class.dir value=target/classes /
-property name=activemq.home value=.. /
+property name=activemq.home value=../../.. /
 
 !-- example program defaults --
 property name=url value=tcp://localhost:61616 /

activemq git commit: AMQ-5793 - fix example

2015-05-22 Thread andytaylor

Repository: activemq
Updated Branches:
  refs/heads/master 5ee9a3426 - cc36633ce


AMQ-5793 - fix example

https://issues.apache.org/jira/browse/AMQ-5793


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

Branch: refs/heads/master
Commit: cc36633cefc8f45372f70009183ef3cececb496f
Parents: 5ee9a34
Author: Andy Taylor andy.tayl...@gmail.com
Authored: Fri May 22 08:55:23 2015 +0100
Committer: Andy Taylor andy.tayl...@gmail.com
Committed: Fri May 22 08:55:23 2015 +0100

--
 assembly/src/release/examples/openwire/swissarmy/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/cc36633c/assembly/src/release/examples/openwire/swissarmy/build.xml
--
diff --git a/assembly/src/release/examples/openwire/swissarmy/build.xml 
b/assembly/src/release/examples/openwire/swissarmy/build.xml
index e5657eb..3214d32 100755
--- a/assembly/src/release/examples/openwire/swissarmy/build.xml
+++ b/assembly/src/release/examples/openwire/swissarmy/build.xml
@@ -18,7 +18,7 @@
 project name=Inbox default=help basedir=.
 
 property name=class.dir value=target/classes /
-property name=activemq.home value=.. /
+property name=activemq.home value=../../.. /
 
 !-- example program defaults --
 property name=url value=tcp://localhost:61616 /

Build failed in Jenkins: ActiveMQ-Java7-All-UnitTests #121

2015-05-22 Thread Apache Jenkins Server

See https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/121/changes

Changes:

[andy.tayls67] AMQ-5782 Added support to the Resource Adapter for SSL

[gtully] https://issues.apache.org/jira/browse/AMQ-5791 - apply patch from 
VladimÃr Äaniga with thanks

--
[...truncated 1285 lines...]
[INFO] Reactor Summary:
[INFO] 
[INFO] ActiveMQ .. SUCCESS [3.145s]
[INFO] ActiveMQ :: Client  SUCCESS [1:52.545s]
[INFO] ActiveMQ :: Openwire Legacy Support ... SUCCESS [2.617s]
[INFO] ActiveMQ :: JAAS .. SUCCESS [31.870s]
[INFO] ActiveMQ :: Broker  SUCCESS [1:18.501s]
[INFO] ActiveMQ :: KahaDB Store .. SUCCESS [2:00.333s]
[INFO] ActiveMQ :: STOMP Protocol  SUCCESS [9:56.076s]
[INFO] ActiveMQ :: MQTT Protocol . FAILURE [11:35.870s]
[INFO] ActiveMQ :: JDBC Store  SUCCESS [1.515s]
[INFO] ActiveMQ :: LevelDB Store . SUCCESS [5:24.448s]
[INFO] ActiveMQ :: Generic JMS Pool .. SUCCESS [41.240s]
[INFO] ActiveMQ :: Pool .. SUCCESS [2.737s]
[INFO] ActiveMQ :: RA  SUCCESS [2:29.634s]
[INFO] ActiveMQ :: Spring  SKIPPED
[INFO] ActiveMQ :: AMQP .. SKIPPED
[INFO] ActiveMQ :: Console ... SUCCESS [2.116s]
[INFO] ActiveMQ :: Partition Management .. SUCCESS [18.440s]
[INFO] ActiveMQ :: Unit Tests  SKIPPED
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 36:39.378s
[INFO] Finished at: Fri May 22 06:35:43 UTC 2015
[INFO] Final Memory: 76M/1244M
[INFO] 
Waiting for Jenkins to finish collecting data
[ERROR] Failed to execute goal 
org.apache.maven.plugins:maven-surefire-plugin:2.16:test (default-test) on 
project activemq-mqtt: ExecutionException; nested exception is 
java.util.concurrent.ExecutionException: java.lang.RuntimeException: The forked 
VM terminated without saying properly goodbye. VM crash or System.exit called ?
[ERROR] Command was/bin/sh -c cd 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt 
 /home/jenkins/tools/java/jdk1.7.0_25-32/jre/bin/java -jar 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefirebooter372008594236487888.jar
 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefire2485231718065494105tmp
 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefire_747424976068143490429tmp
[ERROR] - [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal 
org.apache.maven.plugins:maven-surefire-plugin:2.16:test (default-test) on 
project activemq-mqtt: ExecutionException; nested exception is 
java.util.concurrent.ExecutionException: java.lang.RuntimeException: The forked 
VM terminated without saying properly goodbye. VM crash or System.exit called ?
Command was/bin/sh -c cd 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt 
 /home/jenkins/tools/java/jdk1.7.0_25-32/jre/bin/java -jar 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefirebooter372008594236487888.jar
 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefire2485231718065494105tmp
 
https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/ws/activemq-mqtt/target/surefire/surefire_747424976068143490429tmp
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213)
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at 
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at 
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at 
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at 
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at 
org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:117)
at

buildbot failure in ASF Buildbot on activemq-site-production

2015-05-22 Thread buildbot

The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/9405

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

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

2015-05-22 Thread tabish

Repository: activemq
Updated Branches:
  refs/heads/master 7043f32bb - 13b915ad1


https://issues.apache.org/jira/browse/AMQ-5795

Allow fallback of message transformers when configured one can't handle
the incoming message. 

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

Branch: refs/heads/master
Commit: 13b915ad19c502e1cae6cb5a20467bfcb4d51e92
Parents: 7043f32
Author: Timothy Bish tabish...@gmail.com
Authored: Fri May 22 18:57:42 2015 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Fri May 22 18:57:42 2015 -0400

--
 .../message/AMQPNativeInboundTransformer.java   |  10 ++
 .../amqp/message/AMQPRawInboundTransformer.java |  10 ++
 .../amqp/message/InboundTransformer.java|   6 +-
 .../message/JMSMappingInboundTransformer.java   |  10 ++
 .../transport/amqp/protocol/AmqpReceiver.java   |  23 ++-
 .../transport/amqp/client/AmqpMessage.java  |  48 +
 .../transport/amqp/client/AmqpSession.java  |   2 +-
 .../interop/AmqpDescribedTypePayloadTest.java   | 176 +++
 8 files changed, 281 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/13b915ad/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeInboundTransformer.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeInboundTransformer.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeInboundTransformer.java
index 9789e7b..a28b301 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeInboundTransformer.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPNativeInboundTransformer.java
@@ -25,6 +25,16 @@ public class AMQPNativeInboundTransformer extends 
AMQPRawInboundTransformer {
 }
 
 @Override
+public String getTransformerName() {
+return TRANSFORMER_NATIVE;
+}
+
+@Override
+public InboundTransformer getFallbackTransformer() {
+return new AMQPRawInboundTransformer(getVendor());
+}
+
+@Override
 public Message transform(EncodedMessage amqpMessage) throws Exception {
 org.apache.qpid.proton.message.Message amqp = amqpMessage.decode();
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/13b915ad/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java
index 5742a76..d60a96b 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/AMQPRawInboundTransformer.java
@@ -26,6 +26,16 @@ public class AMQPRawInboundTransformer extends 
InboundTransformer {
 }
 
 @Override
+public String getTransformerName() {
+return TRANSFORMER_RAW;
+}
+
+@Override
+public InboundTransformer getFallbackTransformer() {
+return null;  // No fallback from full raw transform
+}
+
+@Override
 public Message transform(EncodedMessage amqpMessage) throws Exception {
 BytesMessage rc = vendor.createBytesMessage();
 rc.writeBytes(amqpMessage.getArray(), amqpMessage.getArrayOffset(), 
amqpMessage.getLength());

http://git-wip-us.apache.org/repos/asf/activemq/blob/13b915ad/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java
index eff0ae7..1310bcd 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/InboundTransformer.java
@@ -59,7 +59,11 @@ public abstract class InboundTransformer {
 this.vendor = vendor;
 }
 
-abstract public Message transform(EncodedMessage amqpMessage) throws 
Exception;
+public abstract Message transform(EncodedMessage amqpMessage) throws 
Exception;
+
+public abstract String getTransformerName();
+
+public

[1/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5771

2015-05-22 Thread tabish

Repository: activemq
Updated Branches:
  refs/heads/master 9bc602be4 - 7043f32bb


https://issues.apache.org/jira/browse/AMQ-5771

Including remote ip address when logging authentication failures


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

Branch: refs/heads/master
Commit: 84737f7749a74fda8b17e20ff02e5efd2adac764
Parents: 9bc602b
Author: Christopher L. Shannon christopher.l.shan...@gmail.com
Authored: Thu May 21 20:36:41 2015 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Fri May 22 15:37:48 2015 -0400

--
 .../main/java/org/apache/activemq/broker/TransportConnection.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/84737f77/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
 
b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
index a86a36e..84d2101 100755
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
@@ -348,7 +348,8 @@ public class TransportConnection implements Connection, 
Task, CommandVisitor {
 
 if (responseRequired) {
 if (e instanceof SecurityException || e.getCause() instanceof 
SecurityException) {
-SERVICELOG.warn(Security Error occurred: {}, 
e.getMessage());
+SERVICELOG.warn(Security Error occurred on connection to: 
{}, {},
+transport.getRemoteAddress(), e.getMessage());
 }
 response = new ExceptionResponse(e);
 } else {

[2/2] activemq git commit: This closes #103

2015-05-22 Thread tabish

This closes #103


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

Branch: refs/heads/master
Commit: 7043f32bb2a6c9139d6bfb4f1af8916f9576b809
Parents: 9bc602b 84737f7
Author: Timothy Bish tabish...@gmail.com
Authored: Fri May 22 15:39:54 2015 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Fri May 22 15:39:54 2015 -0400

--
 .../main/java/org/apache/activemq/broker/TransportConnection.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

svn commit: r952389 - in /websites/production/activemq/content: apache-activemq-board-report-201505-may.html cache/main.pageCache

2015-05-22 Thread buildbot

Author: buildbot
Date: Sat May 23 02:21:16 2015
New Revision: 952389

Log:
Production update by buildbot for activemq

Modified:

websites/production/activemq/content/apache-activemq-board-report-201505-may.html
websites/production/activemq/content/cache/main.pageCache

Modified: 
websites/production/activemq/content/apache-activemq-board-report-201505-may.html
==
--- 
websites/production/activemq/content/apache-activemq-board-report-201505-may.html
 (original)
+++ 
websites/production/activemq/content/apache-activemq-board-report-201505-may.html
 Sat May 23 02:21:16 2015
@@ -72,7 +72,13 @@
   tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontentpstrongTLP Description:/strongbr 
clear=noneApache 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, J2EE 1.4, AMQP 
1.0./ppstrongCommunity:#160;/strong/pp*#160;The development and 
user lists continue to remain activebr clear=none* span style=color: 
rgb(34,34,34);Two resignations from the PMC, one suspended his request to 
resign and other is currently reconsidering#160;/spanbr 
clear=none*#160;span style=color: rgb(34,34,34);New mailing list 
created for JIRA issues, git pull requests, etc. named#160;a shape=rect 
class=external-link href=mailto:iss...@activemq.apache.org; 
rel=nofollowiss...@activemq.apache.org/abr clear=none* Donated code 
base renamed to ActiveMQ Artemis (based on a vote)
 /spanbr clear=none* span style=color: rgb(34,34,34);Marc 
Sch#246;chlin/span#160;voted in as a committer on 16 May 2015br 
clear=none*#160;span style=color: rgb(34,34,34);Jeff 
Genender/span#160;voted in as a committer on 16 May 
2015/ppstrongDevelopment:#160;/strong/pp*#160;Development on 
ActiveMQ 5.12 is in progress and remains very activebr 
clear=none*#160;Development on ActiveMQ Artemis 1.0.0 RC2 is in progress 
and is very activespan style=color: rgb(34,34,34);br clear=none* 
Development on ActiveMQ Apollo seems to have 
stalled/span/ppstrongTrademark / Branding Status:/strongspan 
style=line-height: 1.4285715;#160;/span/pp*#160;Sub-projects need to 
be reviewed to make sure they are also compliant with trademark policiesbr 
clear=none* Documentation also being reviewed for compliancespan 
style=color: rgb(34,34,34);br clear=none/span/p/div
+div class=wiki-content maincontentdiv class=aui-message warning 
shadowed information-macro
+span class=aui-icon icon-warningIcon/span
+div class=message-content
+pstrongThe May ASF board meeting already took 
place this week, so we will need to publish this report in time for next 
month's meeting.#160;/strong/p
+/div
+/div
+pstrong style=line-height: 1.4285715;TLP 
Description:/strong/ppApache 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, J2EE 1.4, AMQP 
1.0./ppstrongCommunity:#160;/strong/pp*#160;The development and 
user lists continue to remain activebr clear=none* span style=color: 
rgb(34,34,34);Two resignations from the PMC, one suspended his request to 
resign and other is currently reconsidering#160;/spanbr 
clear=none*#160;span style=color: rgb(34,34,34);New mailing list 
created for JIRA issues, git pull requests, etc. named#160;a shape=rect 
class=external-link href=mailto:iss...@activemq.apache.org; 
rel=nofollowiss...@activemq.apache.org/abr clear=none* Donated code 
base renamed to ActiveMQ Artemis (based on a vote)/spanbr clear
 =none* span style=color: rgb(34,34,34);Marc 
Sch#246;chlin/span#160;voted in as a committer on 16 May 2015br 
clear=none*#160;span style=color: rgb(34,34,34);Jeff 
Genender/span#160;voted in as a committer on 16 May 
2015/ppstrongDevelopment:#160;/strong/pp*#160;Development on 
ActiveMQ 5.12 is in progress and remains very activebr 
clear=none*#160;Development on ActiveMQ Artemis 1.0.0 RC2 is in progress 
and is very activespan style=color: rgb(34,34,34);br clear=none* 
Development on ActiveMQ Apollo seems to have 
stalled/span/ppstrongTrademark / Branding Status:/strongspan 
style=line-height: 1.4285715;#160;/span/pp*#160;Sub-projects need to 
be reviewed to make sure they are also compliant with trademark policiesbr 
clear=none* Documentation also being reviewed for compliancespan 
style=color: rgb(34,34,34);br clear=none/span/p/div
 /td
 td valign=top
   div class=navigation

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.05 (May)

2015-05-22 Thread Bruce Snyder (Confluence)















  


Bruce Snyder edited the page:
 


Apache ActiveMQ Board Report - 2015.05 (May)   









 Note




  The May ASF board meeting already took place this week, so we will need to publish this report in time for next month's meeting.  



 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, J2EE 1.4, AMQP 1.0.
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


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

buildbot success in ASF Buildbot on activemq-site-production

2015-05-22 Thread buildbot

The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/9406

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

Jenkins build is unstable: ActiveMQ-Java8 #363

2015-05-22 Thread Apache Jenkins Server

See https://builds.apache.org/job/ActiveMQ-Java8/363/changes

Jenkins build is unstable: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #363

2015-05-22 Thread Apache Jenkins Server

See 
https://builds.apache.org/job/ActiveMQ-Java8/org.apache.activemq$activemq-unit-tests/363/changes

activemq git commit: https://issues.apache.org/jira/browse/AMQ-4705 - close window where both master and slave can be active - slave waits for possible keepAlivePeriod with the lock before startin. En

2015-05-22 Thread gtully

Repository: activemq
Updated Branches:
  refs/heads/master cc36633ce - 9bc602be4


https://issues.apache.org/jira/browse/AMQ-4705 - close window where both master 
and slave can be active - slave waits for possible keepAlivePeriod with the 
lock before startin. Ensures a keepAlive has completed on the master


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

Branch: refs/heads/master
Commit: 9bc602be43e9ce5f8747a0ac9eafe09ee40b0ac6
Parents: cc36633
Author: gtully gary.tu...@gmail.com
Authored: Fri May 22 11:40:25 2015 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Fri May 22 11:40:40 2015 +0100

--
 .../apache/activemq/store/SharedFileLocker.java |  10 +-
 .../activemq/store/SharedFileLockerTest.java| 287 ---
 2 files changed, 195 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/9bc602be/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java 
b/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
index 36ebe62..56e7bde 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
@@ -18,6 +18,7 @@ package org.apache.activemq.store;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.broker.AbstractLocker;
 import org.apache.activemq.util.LockFile;
@@ -54,6 +55,13 @@ public class SharedFileLocker extends AbstractLocker {
 while ((!isStopped())  (!isStopping())) {
 try {
 lockFile.lock();
+if (warned) {
+// ensure lockHolder has released; wait for one 
keepAlive iteration
+try {
+TimeUnit.MILLISECONDS.sleep(lockable != null ? 
lockable.getLockKeepAlivePeriod() : 0l);
+} catch (InterruptedException e1) {
+}
+}
 locked = keepAlive();
 break;
 } catch (IOException e) {
@@ -72,7 +80,7 @@ public class SharedFileLocker extends AbstractLocker {
 +  seconds for the database to be 
unlocked. Reason: 
 + e);
 try {
-Thread.sleep(lockAcquireSleepInterval);
+
TimeUnit.MILLISECONDS.sleep(lockAcquireSleepInterval);
 } catch (InterruptedException e1) {
 }
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/9bc602be/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
index ba768c0..c5234fb 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
@@ -18,155 +18,240 @@
 package org.apache.activemq.store;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.activemq.broker.LockableServiceSupport;
+import org.apache.activemq.broker.Locker;
 import org.apache.activemq.util.DefaultTestAppender;
 import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.util.LockFile;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.util.Wait;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.slf4j.LoggerFactory;
+
+
+import static junit.framework.Assert.assertTrue;
 
-public class SharedFileLockerTest
-{
-   @Rule
-   public TemporaryFolder testFolder;
+public class SharedFileLockerTest {
+private

Git Push Summary

activemq git commit: AMQ-5793 - fix swissarmy knife example

activemq git commit: AMQ-5793 - fix example

Build failed in Jenkins: ActiveMQ-Java7-All-UnitTests #121

buildbot failure in ASF Buildbot on activemq-site-production

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

[1/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5771

[2/2] activemq git commit: This closes #103

svn commit: r952389 - in /websites/production/activemq/content: apache-activemq-board-report-201505-may.html cache/main.pageCache

[CONF] Apache ActiveMQ Apache ActiveMQ Board Report - 2015.05 (May)

buildbot success in ASF Buildbot on activemq-site-production

Jenkins build is unstable: ActiveMQ-Java8 #363

Jenkins build is unstable: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #363

activemq git commit: https://issues.apache.org/jira/browse/AMQ-4705 - close window where both master and slave can be active - slave waits for possible keepAlivePeriod with the lock before startin. En

14 matches

Site Navigation

Mail list logo

Footer information