You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/24 22:29:29 UTC
[1/3] activemq-artemis git commit: ARTEMIS-531 fix war name
Repository: activemq-artemis
Updated Branches:
refs/heads/master 20e731a7f -> b5d252af2
ARTEMIS-531 fix war name
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b4bb5bb5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b4bb5bb5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b4bb5bb5
Branch: refs/heads/master
Commit: b4bb5bb576cedcc4b24c152c7dde02dbef7129a2
Parents: 20e731a
Author: jbertram <jb...@apache.org>
Authored: Tue May 24 15:08:23 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue May 24 15:09:23 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b4bb5bb5/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index 4ea400a..5612269 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,4 +1,4 @@
<!-- The web server is only bound to loalhost by default -->
<web bind="http://localhost:${http.port}" path="web">
- <app url="jolokia" war="jolokia-war-1.3.2.war"/>
+ <app url="jolokia" war="jolokia-war-1.3.3.war"/>
</web>
[2/3] activemq-artemis git commit: ARTEMIS-536 fix checkstyle
Posted by cl...@apache.org.
ARTEMIS-536 fix checkstyle
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e8d0639d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e8d0639d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e8d0639d
Branch: refs/heads/master
Commit: e8d0639d05cd709ccfe395b6e058728dd97a8fce
Parents: b4bb5bb
Author: jbertram <jb...@apache.org>
Authored: Tue May 24 15:37:53 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue May 24 15:37:53 2016 -0500
----------------------------------------------------------------------
.../proton/converter/message/JMSMappingOutboundTransformer.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e8d0639d/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
index 99fb7c3..af8afc2 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.artemis.core.protocol.proton.converter.message;
-import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.UnsignedByte;
[3/3] activemq-artemis git commit: This closes #536
Posted by cl...@apache.org.
This closes #536
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b5d252af
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b5d252af
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b5d252af
Branch: refs/heads/master
Commit: b5d252af2cc987409c205f778203a6db60370ba1
Parents: 20e731a e8d0639
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 24 18:29:16 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 24 18:29:16 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt | 2 +-
.../proton/converter/message/JMSMappingOutboundTransformer.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------