Jenkins build is still unstable: ActiveMQ-Java7 #689

2015-05-07 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java7 » ActiveMQ :: Unit Tests #689

2015-05-07 Thread Apache Jenkins Server 
See

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

2015-05-07 Thread tabish 
Repository: activemq
Updated Branches:
  refs/heads/master c10e6fa8f -> 3bfffca9c


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

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

Branch: refs/heads/master
Commit: 3bfffca9c92ace9100a630fa80ed5b4a58a5e1a7
Parents: c10e6fa
Author: Timothy Bish 
Authored: Thu May 7 18:42:11 2015 -0400
Committer: Timothy Bish 
Committed: Thu May 7 18:42:11 2015 -0400

--
 .../src/test/java/org/apache/activemq/advisory/AdvisoryTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3bfffca9/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
index 07a2daa..1ad1ef4 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
@@ -229,7 +229,7 @@ public class AdvisoryTests {
 }
 
 @After
-protected void tearDown() throws Exception {
+public void tearDown() throws Exception {
 connection.close();
 if (broker != null) {
 broker.stop();

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

2015-05-07 Thread tabish 
Repository: activemq
Updated Branches:
  refs/heads/master 188434c6e -> c10e6fa8f


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

Convert to JUnit 4 while fixing sporadic failure due to the expiry
setting being left at default of 30 seconds, which on a fast machine
means the expiry tests sometime finish before the task kicks in.

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

Branch: refs/heads/master
Commit: c10e6fa8f021921f67ec309b9e4030f8c89ce01d
Parents: 188434c
Author: Timothy Bish 
Authored: Thu May 7 18:30:02 2015 -0400
Committer: Timothy Bish 
Committed: Thu May 7 18:31:00 2015 -0400

--
 .../advisory/AdvisoryTempDestinationTests.java  | 51 --
 .../apache/activemq/advisory/AdvisoryTests.java | 72 
 2 files changed, 71 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/c10e6fa8/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
index 5e20f79..17044b2 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
@@ -16,6 +16,10 @@
  */
 package org.apache.activemq.advisory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,8 +35,6 @@ import javax.jms.Session;
 import javax.jms.TemporaryQueue;
 import javax.jms.Topic;
 
-import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -41,16 +43,21 @@ import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-public class AdvisoryTempDestinationTests extends TestCase {
+public class AdvisoryTempDestinationTests {
 
 protected static final int MESSAGE_COUNT = 2000;
+protected static final int EXPIRE_MESSAGE_PERIOD = 1;
+
 protected BrokerService broker;
 protected Connection connection;
 protected String bindAddress = 
ActiveMQConnectionFactory.DEFAULT_BROKER_BIND_URL;
 protected int topicCount;
 
-
+@Test(timeout = 6)
 public void testNoSlowConsumerAdvisory() throws Exception {
 Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 TemporaryQueue queue = s.createTemporaryQueue();
@@ -60,8 +67,8 @@ public class AdvisoryTempDestinationTests extends TestCase {
 public void onMessage(Message message) {
 }
 });
-Topic advisoryTopic = AdvisorySupport
-.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
+
+Topic advisoryTopic = 
AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
 s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
 // start throwing messages at the consumer
@@ -75,14 +82,14 @@ public class AdvisoryTempDestinationTests extends TestCase {
 assertNull(msg);
 }
 
+@Test(timeout = 6)
 public void testSlowConsumerAdvisory() throws Exception {
 Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 TemporaryQueue queue = s.createTemporaryQueue();
 MessageConsumer consumer = s.createConsumer(queue);
 assertNotNull(consumer);
 
-Topic advisoryTopic = AdvisorySupport
-.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
+Topic advisoryTopic = 
AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
 s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
 // start throwing messages at the consumer
@@ -96,6 +103,7 @@ public class AdvisoryTempDestinationTests extends TestCase {
 assertNotNull(msg);
 }
 
+@Test(timeout = 6)

Jenkins build is unstable: ActiveMQ-Java8 #346

2015-05-07 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: Generic JMS Pool #346

2015-05-07 Thread Apache Jenkins Server 
See

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

2015-05-07 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: File Server #346

2015-05-07 Thread Apache Jenkins Server 
See

[1/4] activemq-artemis git commit: Changed core protocol handshake to use ARTEMIS

2015-05-07 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 930df932b -> a394c831f


Changed core protocol handshake to use ARTEMIS


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

Branch: refs/heads/master
Commit: f07af67632da6fb02cf8bb15e4d81749860129b1
Parents: 930df93
Author: Martyn Taylor 
Authored: Thu May 7 12:16:58 2015 +0100
Committer: Martyn Taylor 
Committed: Thu May 7 14:46:48 2015 +0100

--
 .../core/impl/ActiveMQClientProtocolManager.java  |  3 ++-
 .../core/protocol/core/impl/CoreProtocolManager.java  | 14 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f07af676/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 0a5dcca..aa75d75 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -74,6 +74,8 @@ import org.apache.activemq.artemis.utils.VersionLoader;
 
 public class ActiveMQClientProtocolManager implements ClientProtocolManager
 {
+   private static final String handshake = "ARTEMIS";
+
private final int versionID = 
VersionLoader.getVersion().getIncrementingVersion();
 
private ClientSessionFactoryInternal factoryInternal;
@@ -479,7 +481,6 @@ public class ActiveMQClientProtocolManager implements 
ClientProtocolManager
   if (transportConnection.isUsingProtocolHandling())
   {
  // no need to send handshake on inVM as inVM is not using the 
NettyProtocolHandling
- String handshake = "HORNETQ";
  ActiveMQBuffer amqbuffer = 
connection.createTransportBuffer(handshake.length());
  amqbuffer.writeBytes(handshake.getBytes());
  transportConnection.write(amqbuffer);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f07af676/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
index 8696946..f56e017 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java
@@ -185,13 +185,13 @@ class CoreProtocolManager implements 
ProtocolManager
public void handshake(NettyServerConnection connection, ActiveMQBuffer 
buffer)
{
   //if we are not an old client then handshake
-  if (buffer.getByte(0) == 'H' &&
- buffer.getByte(1) == 'O' &&
- buffer.getByte(2) == 'R' &&
- buffer.getByte(3) == 'N' &&
- buffer.getByte(4) == 'E' &&
- buffer.getByte(5) == 'T' &&
- buffer.getByte(6) == 'Q')
+  if (buffer.getByte(0) == 'A' &&
+ buffer.getByte(1) == 'R' &&
+ buffer.getByte(2) == 'T' &&
+ buffer.getByte(3) == 'E' &&
+ buffer.getByte(4) == 'M' &&
+ buffer.getByte(5) == 'I' &&
+ buffer.getByte(6) == 'S')
   {
  //todo add some handshaking
  buffer.readBytes(7);

[3/4] activemq-artemis git commit: Log the protocol module name on boot

2015-05-07 Thread clebertsuconic 
Log the protocol module name on boot


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

Branch: refs/heads/master
Commit: a176a542aa1272731c583eae8a64163c72b127de
Parents: 77efc95
Author: Martyn Taylor 
Authored: Thu May 7 14:37:34 2015 +0100
Committer: Clebert Suconic 
Committed: Thu May 7 14:59:46 2015 -0400

--
 .../core/protocol/proton/ProtonProtocolManagerFactory.java  | 8 
 .../protocol/hornetq/HornetQProtocolManagerFactory.java | 8 
 .../protocol/openwire/OpenWireProtocolManagerFactory.java   | 7 +++
 .../core/protocol/stomp/StompProtocolManagerFactory.java| 8 
 .../core/protocol/core/impl/CoreProtocolManagerFactory.java | 9 +
 .../core/remoting/server/impl/RemotingServiceImpl.java  | 8 
 .../activemq/artemis/core/server/ActiveMQServerLogger.java  | 4 ++--
 .../artemis/spi/core/protocol/ProtocolManagerFactory.java   | 2 ++
 8 files changed, 48 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a176a542/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java
index 541a4b4..dc9c20f 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java
@@ -29,6 +29,8 @@ public class ProtonProtocolManagerFactory extends 
AbstractProtocolManagerFactory
 {
private static final String AMQP_PROTOCOL_NAME = "AMQP";
 
+   private static final String MODULE_NAME = "artemis-amqp-protocol";
+
private static String[] SUPPORTED_PROTOCOLS = {AMQP_PROTOCOL_NAME};
 
@Override
@@ -49,4 +51,10 @@ public class ProtonProtocolManagerFactory extends 
AbstractProtocolManagerFactory
{
   return SUPPORTED_PROTOCOLS;
}
+
+   @Override
+   public String getModuleName()
+   {
+  return MODULE_NAME;
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a176a542/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HornetQProtocolManagerFactory.java
--
diff --git 
a/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HornetQProtocolManagerFactory.java
 
b/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HornetQProtocolManagerFactory.java
index 956fdb7..3ba12ea 100644
--- 
a/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HornetQProtocolManagerFactory.java
+++ 
b/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HornetQProtocolManagerFactory.java
@@ -28,6 +28,8 @@ public class HornetQProtocolManagerFactory extends 
CoreProtocolManagerFactory
 {
public static final String HORNETQ_PROTOCOL_NAME = "HORNETQ";
 
+   private static final String MODULE_NAME = "artemis-hornetq-protocol";
+
private static String[] SUPPORTED_PROTOCOLS = {HORNETQ_PROTOCOL_NAME};
 
public ProtocolManager createProtocolManager(final ActiveMQServer server, 
final List incomingInterceptors, List 
outgoingInterceptors)
@@ -43,4 +45,10 @@ public class HornetQProtocolManagerFactory extends 
CoreProtocolManagerFactory
{
   return SUPPORTED_PROTOCOLS;
}
+
+   @Override
+   public String getModuleName()
+   {
+  return MODULE_NAME;
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a176a542/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactor

[4/4] activemq-artemis git commit: This closes #235 - on HornetQ protocol support This closes #227 - This PR was reworked as #235 to fix a small pom issue (typo)

2015-05-07 Thread clebertsuconic 
This closes #235 - on HornetQ protocol support
This closes #227 - This PR was reworked as #235 to fix a small pom issue (typo)


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

Branch: refs/heads/master
Commit: a394c831f94115d5798160abe273307c3884e76b
Parents: 930df93 a176a54
Author: Clebert Suconic 
Authored: Thu May 7 15:33:55 2015 -0400
Committer: Clebert Suconic 
Committed: Thu May 7 15:33:55 2015 -0400

--
 .../impl/ActiveMQClientProtocolManager.java |   3 +-
 .../proton/ProtonProtocolManagerFactory.java|   8 +
 .../artemis-hornetq-protocol/pom.xml|  53 +
 .../HQPropertiesConversionInterceptor.java  | 101 
 .../hornetq/HornetQProtocolManager.java |  62 +
 .../hornetq/HornetQProtocolManagerFactory.java  |  54 +
 ...mis.spi.core.protocol.ProtocolManagerFactory |   1 +
 .../OpenWireProtocolManagerFactory.java |   7 +
 .../stomp/StompProtocolManagerFactory.java  |   8 +
 artemis-protocols/pom.xml   |   1 +
 .../protocol/core/impl/CoreProtocolManager.java |  18 +-
 .../core/impl/CoreProtocolManagerFactory.java   |   9 +
 .../server/impl/RemotingServiceImpl.java|   8 +-
 .../core/server/ActiveMQServerLogger.java   |   4 +-
 .../core/protocol/ProtocolManagerFactory.java   |   2 +
 tests/extra-tests/pom.xml   |  44 ++--
 .../protocols/hornetq/HornetQProtocolTest.java  | 232 +++
 17 files changed, 582 insertions(+), 33 deletions(-)
--

[2/4] activemq-artemis git commit: ACTIVEMQ6-100 Add support for HornetQ clients

2015-05-07 Thread clebertsuconic 
ACTIVEMQ6-100 Add support for HornetQ clients


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

Branch: refs/heads/master
Commit: 77efc950af9bd6af69561d6b7f5e701c2740cf22
Parents: f07af67
Author: Martyn Taylor 
Authored: Thu May 7 12:54:24 2015 +0100
Committer: Clebert Suconic 
Committed: Thu May 7 14:59:46 2015 -0400

--
 .../artemis-hornetq-protocol/pom.xml|  53 +
 .../HQPropertiesConversionInterceptor.java  | 101 
 .../hornetq/HornetQProtocolManager.java |  62 +
 .../hornetq/HornetQProtocolManagerFactory.java  |  46 
 ...mis.spi.core.protocol.ProtocolManagerFactory |   1 +
 artemis-protocols/pom.xml   |   1 +
 .../protocol/core/impl/CoreProtocolManager.java |   4 +-
 tests/extra-tests/pom.xml   |  44 ++--
 .../protocols/hornetq/HornetQProtocolTest.java  | 232 +++
 9 files changed, 525 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/77efc950/artemis-protocols/artemis-hornetq-protocol/pom.xml
--
diff --git a/artemis-protocols/artemis-hornetq-protocol/pom.xml 
b/artemis-protocols/artemis-hornetq-protocol/pom.xml
new file mode 100644
index 000..7cfc745
--- /dev/null
+++ b/artemis-protocols/artemis-hornetq-protocol/pom.xml
@@ -0,0 +1,53 @@
+
+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/xsd/maven-4.0.0.xsd";>
+   
+  artemis-protocols
+  org.apache.activemq
+  1.0.0-SNAPSHOT
+   
+   4.0.0
+
+   artemis-hornetq-protocol
+
+   
+  ${project.basedir}/../..
+   
+
+   
+  
+ org.jboss.logging
+ jboss-logging-processor
+ provided
+ true
+  
+
+  
+  
+ org.jboss.logging
+ jboss-logging
+  
+  
+ org.apache.activemq
+ artemis-server
+ ${project.version}
+  
+   
+
+

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/77efc950/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HQPropertiesConversionInterceptor.java
--
diff --git 
a/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HQPropertiesConversionInterceptor.java
 
b/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HQPropertiesConversionInterceptor.java
new file mode 100644
index 000..93ec8bf
--- /dev/null
+++ 
b/artemis-protocols/artemis-hornetq-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HQPropertiesConversionInterceptor.java
@@ -0,0 +1,101 @@
+/**
+ * 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.artemis.core.protocol.hornetq;
+
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.MessagePacket;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+public class HQPropertiesConversionInterceptor implements Interceptor
+{
+   private static Map dictionary;
+
+   static
+   {
+  Map d = new HashMap();
+
+  // Add entries for outgoing messages
+

activemq git commit: Upgrade to jolokia 1.3.0

2015-05-07 Thread davsclaus 
Repository: activemq
Updated Branches:
  refs/heads/master 1271d2ea0 -> 188434c6e


Upgrade to jolokia 1.3.0


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

Branch: refs/heads/master
Commit: 188434c6eeae064bdc728e1d671d44f8c6a9fc51
Parents: 1271d2e
Author: Claus Ibsen 
Authored: Thu May 7 17:37:40 2015 +0200
Committer: Claus Ibsen 
Committed: Thu May 7 17:37:40 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/188434c6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b55f84f..c0fff6f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
 1.1.2
 1.3.7
 2.5.1
-1.2.3
+1.3.0
 1.5_5
 
 1.1.1

[3/3] activemq-artemis git commit: This closes #232 on common example fix

2015-05-07 Thread clebertsuconic 
This closes #232 on common example fix


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

Branch: refs/heads/master
Commit: 930df932b31ce4d336dc76159f9b7d477e6a4382
Parents: 668526f 070f641
Author: Clebert Suconic 
Authored: Thu May 7 09:08:31 2015 -0400
Committer: Clebert Suconic 
Committed: Thu May 7 09:08:31 2015 -0400

--
 examples/jms/aerogear/pom.xml   |   2 +-
 examples/jms/application-layer-failover/pom.xml |   2 +-
 .../jms/artemis-jms-examples-common/common.css  |  47 
 .../config/logging.properties   |  52 -
 .../config/server.properties|  18 --
 .../jms/artemis-jms-examples-common/pom.xml |  60 -
 .../artemis-jms-examples-common/prettify.css|  20 --
 .../jms/artemis-jms-examples-common/prettify.js |  42 
 .../artemis/common/example/ActiveMQExample.java | 224 ---
 .../artemis/common/example/DummyXid.java| 208 -
 examples/jms/bridge/pom.xml |   2 +-
 examples/jms/browser/pom.xml|   2 +-
 examples/jms/client-kickoff/pom.xml |   2 +-
 .../jms/client-side-failoverlistener/pom.xml|   2 +-
 examples/jms/client-side-load-balancing/pom.xml |   2 +-
 .../jms/clustered-durable-subscription/pom.xml  |   2 +-
 examples/jms/clustered-grouping/pom.xml |   2 +-
 examples/jms/clustered-jgroups/pom.xml  |   2 +-
 examples/jms/clustered-queue/pom.xml|   2 +-
 examples/jms/clustered-standalone/pom.xml   |   2 +-
 examples/jms/clustered-static-discovery/pom.xml |   2 +-
 examples/jms/clustered-static-oneway/pom.xml|   2 +-
 examples/jms/clustered-topic/pom.xml|   2 +-
 .../jms/colocated-failover-scale-down/pom.xml   |   2 +-
 examples/jms/colocated-failover/pom.xml |   2 +-
 examples/jms/common/common.css  |  47 
 examples/jms/common/config/logging.properties   |  52 +
 examples/jms/common/config/server.properties|  18 ++
 examples/jms/common/pom.xml |  60 +
 examples/jms/common/prettify.css|  20 ++
 examples/jms/common/prettify.js |  42 
 .../artemis/common/example/ActiveMQExample.java | 224 +++
 .../artemis/common/example/DummyXid.java| 208 +
 examples/jms/consumer-rate-limit/pom.xml|   2 +-
 examples/jms/dead-letter/pom.xml|   2 +-
 examples/jms/delayed-redelivery/pom.xml |   2 +-
 examples/jms/divert/pom.xml |   2 +-
 examples/jms/durable-subscription/pom.xml   |   2 +-
 examples/jms/embedded-simple/pom.xml|   2 +-
 examples/jms/embedded/pom.xml   |   2 +-
 examples/jms/expiry/pom.xml |   2 +-
 examples/jms/ha-policy-autobackup/pom.xml   |   2 +-
 examples/jms/http-transport/pom.xml |   2 +-
 .../jms/instantiate-connection-factory/pom.xml  |   2 +-
 examples/jms/interceptor/pom.xml|   2 +-
 examples/jms/jms-auto-closeable/pom.xml |   2 +-
 examples/jms/jms-bridge/pom.xml |   2 +-
 examples/jms/jms-completion-listener/pom.xml|   2 +-
 examples/jms/jms-context/pom.xml|   2 +-
 examples/jms/jms-shared-consumer/pom.xml|   2 +-
 examples/jms/jmx/pom.xml|   2 +-
 examples/jms/large-message/pom.xml  |   2 +-
 examples/jms/last-value-queue/pom.xml   |   2 +-
 examples/jms/management-notifications/pom.xml   |   2 +-
 examples/jms/management/pom.xml |   2 +-
 examples/jms/message-counters/pom.xml   |   2 +-
 examples/jms/message-group/pom.xml  |   2 +-
 examples/jms/message-group2/pom.xml |   2 +-
 examples/jms/message-priority/pom.xml   |   2 +-
 examples/jms/multiple-failover-failback/pom.xml |   2 +-
 examples/jms/multiple-failover/pom.xml  |   2 +-
 examples/jms/no-consumer-buffering/pom.xml  |   2 +-
 examples/jms/non-transaction-failover/pom.xml   |   2 +-
 examples/jms/openwire/pom.xml   |   2 +-
 examples/jms/paging/pom.xml |   2 +-
 examples/jms/perf/pom.xml   |   2 +-
 examples/jms/pom.xml|   4 +-
 examples/jms/pre-acknowledge/pom.xml|   2 +-
 examples/jms/producer-rate-limit/pom.xml|   2 +-
 examples/jms/proton-cpp/pom.xml |   2 +-
 examples/jms/proton-j/pom.xml   |   2 +-
 examples/jms/proton-ruby/pom.xml|   2 +-
 .../jms/queue-message-redistribution/pom.xml|   2 +-
 examples/jms/queue-requestor/p

[2/3] activemq-artemis git commit: Fixing examples commons

2015-05-07 Thread clebertsuconic 
Fixing examples commons

Examples/common was wrongly renamed long time ago, commons/prettify was broken 
and this will fix formatting on the README files


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

Branch: refs/heads/master
Commit: 070f641f0d8b0094e685a683372938cdb8f1ac57
Parents: 668526f
Author: Clebert Suconic 
Authored: Wed May 6 22:22:37 2015 -0400
Committer: Clebert Suconic 
Committed: Thu May 7 09:08:20 2015 -0400

--
 examples/jms/aerogear/pom.xml   |   2 +-
 examples/jms/application-layer-failover/pom.xml |   2 +-
 .../jms/artemis-jms-examples-common/common.css  |  47 
 .../config/logging.properties   |  52 -
 .../config/server.properties|  18 --
 .../jms/artemis-jms-examples-common/pom.xml |  60 -
 .../artemis-jms-examples-common/prettify.css|  20 --
 .../jms/artemis-jms-examples-common/prettify.js |  42 
 .../artemis/common/example/ActiveMQExample.java | 224 ---
 .../artemis/common/example/DummyXid.java| 208 -
 examples/jms/bridge/pom.xml |   2 +-
 examples/jms/browser/pom.xml|   2 +-
 examples/jms/client-kickoff/pom.xml |   2 +-
 .../jms/client-side-failoverlistener/pom.xml|   2 +-
 examples/jms/client-side-load-balancing/pom.xml |   2 +-
 .../jms/clustered-durable-subscription/pom.xml  |   2 +-
 examples/jms/clustered-grouping/pom.xml |   2 +-
 examples/jms/clustered-jgroups/pom.xml  |   2 +-
 examples/jms/clustered-queue/pom.xml|   2 +-
 examples/jms/clustered-standalone/pom.xml   |   2 +-
 examples/jms/clustered-static-discovery/pom.xml |   2 +-
 examples/jms/clustered-static-oneway/pom.xml|   2 +-
 examples/jms/clustered-topic/pom.xml|   2 +-
 .../jms/colocated-failover-scale-down/pom.xml   |   2 +-
 examples/jms/colocated-failover/pom.xml |   2 +-
 examples/jms/common/common.css  |  47 
 examples/jms/common/config/logging.properties   |  52 +
 examples/jms/common/config/server.properties|  18 ++
 examples/jms/common/pom.xml |  60 +
 examples/jms/common/prettify.css|  20 ++
 examples/jms/common/prettify.js |  42 
 .../artemis/common/example/ActiveMQExample.java | 224 +++
 .../artemis/common/example/DummyXid.java| 208 +
 examples/jms/consumer-rate-limit/pom.xml|   2 +-
 examples/jms/dead-letter/pom.xml|   2 +-
 examples/jms/delayed-redelivery/pom.xml |   2 +-
 examples/jms/divert/pom.xml |   2 +-
 examples/jms/durable-subscription/pom.xml   |   2 +-
 examples/jms/embedded-simple/pom.xml|   2 +-
 examples/jms/embedded/pom.xml   |   2 +-
 examples/jms/expiry/pom.xml |   2 +-
 examples/jms/ha-policy-autobackup/pom.xml   |   2 +-
 examples/jms/http-transport/pom.xml |   2 +-
 .../jms/instantiate-connection-factory/pom.xml  |   2 +-
 examples/jms/interceptor/pom.xml|   2 +-
 examples/jms/jms-auto-closeable/pom.xml |   2 +-
 examples/jms/jms-bridge/pom.xml |   2 +-
 examples/jms/jms-completion-listener/pom.xml|   2 +-
 examples/jms/jms-context/pom.xml|   2 +-
 examples/jms/jms-shared-consumer/pom.xml|   2 +-
 examples/jms/jmx/pom.xml|   2 +-
 examples/jms/large-message/pom.xml  |   2 +-
 examples/jms/last-value-queue/pom.xml   |   2 +-
 examples/jms/management-notifications/pom.xml   |   2 +-
 examples/jms/management/pom.xml |   2 +-
 examples/jms/message-counters/pom.xml   |   2 +-
 examples/jms/message-group/pom.xml  |   2 +-
 examples/jms/message-group2/pom.xml |   2 +-
 examples/jms/message-priority/pom.xml   |   2 +-
 examples/jms/multiple-failover-failback/pom.xml |   2 +-
 examples/jms/multiple-failover/pom.xml  |   2 +-
 examples/jms/no-consumer-buffering/pom.xml  |   2 +-
 examples/jms/non-transaction-failover/pom.xml   |   2 +-
 examples/jms/openwire/pom.xml   |   2 +-
 examples/jms/paging/pom.xml |   2 +-
 examples/jms/perf/pom.xml   |   2 +-
 examples/jms/pom.xml|   4 +-
 examples/jms/pre-acknowledge/pom.xml|   2 +-
 examples/jms/producer-rate-limit/pom.xml|   2 +-
 examples/jms/proton-cpp/pom.xml |   2 +-
 examples/jms/proton-j/pom.xml   |   2 +-
 examples/jms/proton-ruby/pom.xml

[1/3] activemq-artemis git commit: Fixing examples commons

2015-05-07 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 668526f0e -> 930df932b


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/070f641f/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
--
diff --git 
a/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
 
b/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
new file mode 100644
index 000..d47e996
--- /dev/null
+++ 
b/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
@@ -0,0 +1,224 @@
+/**
+ * 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.artemis.common.example;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
+import 
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+
+/**
+ * Base class for ActiveMQ examples.
+ * 
+ * This takes care of starting and stopping the server as well as deploying any
+ * queue needed.
+ */
+public abstract class ActiveMQExample
+{
+   protected static final Logger log = 
Logger.getLogger(ActiveMQExample.class.getName());
+
+   protected boolean failure = false;
+
+   protected String[] args;
+
+   public abstract boolean runExample() throws Exception;
+
+   protected void run(final String[] args1)
+   {
+  this.args = args1;
+  //if we have a cluster of servers wait a while for the cluster to form 
properly
+  if(args != null && args.length > 1)
+  {
+ System.out.println("pausing to allow cluster to form");
+ Thread.yield();
+ try
+ {
+Thread.sleep(2000);
+ }
+ catch (InterruptedException e)
+ {
+//ignore
+ }
+  }
+
+  try
+  {
+ if (!runExample())
+ {
+failure = true;
+ }
+ System.out.println("example complete");
+  }
+  catch (Throwable e)
+  {
+ failure = true;
+ e.printStackTrace();
+  }
+  reportResultAndExit();
+   }
+
+   protected void killServer(final int id) throws Exception
+   {
+  String configDir = System.getProperty("exampleConfigDir");
+  if(configDir == null)
+  {
+ throw new Exception("exampleConfigDir must be set as a system 
property");
+  }
+
+  System.out.println("Killing server " + id);
+
+  // We kill the server by creating a new file in the server dir which is 
checked for by the server
+  // We can't use Process.destroy() since this does not do a hard kill - 
it causes shutdown hooks
+  // to be called which cleanly shutdown the server
+  System.out.println(configDir + "/server" + id + "/KILL_ME");
+  File file = new File(configDir + "/server" + id + "/KILL_ME");
+
+  file.createNewFile();
+
+  // Sleep longer than the KillChecker check period
+  Thread.sleep(3000);
+   }
+
+   protected void killServer(final int id, final int serverToWaitFor) throws 
Exception
+   {
+  String configDir = System.getProperty("exampleConfigDir");
+  if(configDir == null)
+  {
+ throw new Exception("exampleConfigDir must be set as a system 
property");
+  }
+
+  System.out.println("Killing server " + id);
+
+  // We kill the server by creating a new file in the server dir which is 
checked for by the server
+  // We can't use Process.destroy() since this does not do a hard kill - 
it causes shutdown hooks
+  // to be called which cleanly shutdown the server
+  System.out.pr

[1/2] activemq-artemis git commit: update logos

2015-05-07 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 7939b37c4 -> 668526f0e


update logos


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

Branch: refs/heads/master
Commit: b709beff05a0ce14ed09c17d8116ecebc46af66b
Parents: 7939b37
Author: Andy Taylor 
Authored: Tue May 5 10:22:39 2015 +0100
Committer: Clebert Suconic 
Committed: Thu May 7 09:06:39 2015 -0400

--
 .../src/main/resources/images/activemq-logo.png| Bin 6819 -> 0 bytes
 .../src/main/resources/images/artemis-logo.png | Bin 0 -> 17626 bytes
 artemis-website/src/main/resources/index.html  |  16 
 docs/user-manual/en/README.md  |   2 +-
 docs/user-manual/en/images/activemq-logo.jpg   | Bin 6819 -> 0 bytes
 docs/user-manual/en/images/artemis-logo.jpg| Bin 0 -> 18517 bytes
 6 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/artemis-website/src/main/resources/images/activemq-logo.png
--
diff --git a/artemis-website/src/main/resources/images/activemq-logo.png 
b/artemis-website/src/main/resources/images/activemq-logo.png
deleted file mode 100644
index d514448..000
Binary files a/artemis-website/src/main/resources/images/activemq-logo.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/artemis-website/src/main/resources/images/artemis-logo.png
--
diff --git a/artemis-website/src/main/resources/images/artemis-logo.png 
b/artemis-website/src/main/resources/images/artemis-logo.png
new file mode 100644
index 000..a9e06f3
Binary files /dev/null and 
b/artemis-website/src/main/resources/images/artemis-logo.png differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/artemis-website/src/main/resources/index.html
--
diff --git a/artemis-website/src/main/resources/index.html 
b/artemis-website/src/main/resources/index.html
index 7ae3fcb..7712762 100644
--- a/artemis-website/src/main/resources/index.html
+++ b/artemis-website/src/main/resources/index.html
@@ -21,7 +21,7 @@
 
 
 
-
+
 
 
 ActiveMQ
@@ -37,16 +37,16 @@
 
 
 
-
-
-
-ActiveMQ Artemis
-ActiveMQ's next generation of messaging
-
-
+
 
 
 
+
+
+Welcome to ActiveMQ Artemis. To get started you can follow any of the 
links below to access the manual, examples
+and the main Artemis website.
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/docs/user-manual/en/README.md
--
diff --git a/docs/user-manual/en/README.md b/docs/user-manual/en/README.md
index 4ea32c8..99d869c 100644
--- a/docs/user-manual/en/README.md
+++ b/docs/user-manual/en/README.md
@@ -1,4 +1,4 @@
-![ActiveMQ logo](images/activemq-logo.jpg)
+![ActiveMQ logo](images/artemis-logo.jpg)
 
 Apache ActiveMQ Artemis User Manual
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/docs/user-manual/en/images/activemq-logo.jpg
--
diff --git a/docs/user-manual/en/images/activemq-logo.jpg 
b/docs/user-manual/en/images/activemq-logo.jpg
deleted file mode 100644
index d514448..000
Binary files a/docs/user-manual/en/images/activemq-logo.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b709beff/docs/user-manual/en/images/artemis-logo.jpg
--
diff --git a/docs/user-manual/en/images/artemis-logo.jpg 
b/docs/user-manual/en/images/artemis-logo.jpg
new file mode 100644
index 000..d2c2c6b
Binary files /dev/null and b/docs/user-manual/en/images/artemis-logo.jpg differ

[2/2] activemq-artemis git commit: This closes #234 - Logo updates

2015-05-07 Thread clebertsuconic 
This closes #234 - Logo updates


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

Branch: refs/heads/master
Commit: 668526f0e5bc288026b7f3dac69ea6e0b5e51c1b
Parents: 7939b37 b709bef
Author: Clebert Suconic 
Authored: Thu May 7 09:06:52 2015 -0400
Committer: Clebert Suconic 
Committed: Thu May 7 09:06:52 2015 -0400

--
 .../src/main/resources/images/activemq-logo.png| Bin 6819 -> 0 bytes
 .../src/main/resources/images/artemis-logo.png | Bin 0 -> 17626 bytes
 artemis-website/src/main/resources/index.html  |  16 
 docs/user-manual/en/README.md  |   2 +-
 docs/user-manual/en/images/activemq-logo.jpg   | Bin 6819 -> 0 bytes
 docs/user-manual/en/images/artemis-logo.jpg| Bin 0 -> 18517 bytes
 6 files changed, 9 insertions(+), 9 deletions(-)
--

[2/2] activemq-artemis git commit: Merge PR #233

2015-05-07 Thread martyntaylor 
Merge PR #233


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

Branch: refs/heads/master
Commit: 7939b37c4b6613f531f227917996dd73656a88af
Parents: 9a81e20 156987e
Author: Martyn Taylor 
Authored: Thu May 7 11:22:22 2015 +0100
Committer: Martyn Taylor 
Committed: Thu May 7 11:22:22 2015 +0100

--
 .../core/protocol/core/impl/BackwardsCompatibilityUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] activemq-artemis git commit: portability typo fix

2015-05-07 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 9a81e201e -> 7939b37c4


portability typo fix


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

Branch: refs/heads/master
Commit: 156987e29e886efae785487d2b8f8987884ad74b
Parents: 9a81e20
Author: Andy Taylor 
Authored: Thu May 7 11:04:20 2015 +0100
Committer: Andy Taylor 
Committed: Thu May 7 11:04:32 2015 +0100

--
 .../core/protocol/core/impl/BackwardsCompatibilityUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/156987e2/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java
index b0efa8e..84dda7d 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java
@@ -42,7 +42,7 @@ public class BackwardsCompatibilityUtils
{
   if (tc != null)
   {
- String className = 
tc.getFactoryClassName().replace("org.apache.activemq", 
"org.hornetq").replace("ActiveMQ", "HornetQ");
+ String className = 
tc.getFactoryClassName().replace("org.apache.activemq.artemis", 
"org.hornetq").replace("ActiveMQ", "HornetQ");
  return new TransportConfiguration(className, tc.getParams(), 
tc.getName());
   }
   return tc;

buildbot success in ASF Buildbot on activemq-site-production

2015-05-07 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/9032

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

buildbot failure in ASF Buildbot on activemq-site-production

2015-05-07 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/9031

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