activemq git commit: AMQ-6045: update to proton-j 0.11.0

2015-11-17 Thread robbie 
Repository: activemq
Updated Branches:
  refs/heads/master 16e66f9d8 -> 11ac3d9d8


AMQ-6045: update to proton-j 0.11.0


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

Branch: refs/heads/master
Commit: 11ac3d9d85a32b5f58e9fdbdb11e9354dc9c689e
Parents: 16e66f9
Author: Robert Gemmell 
Authored: Tue Nov 17 11:41:36 2015 +
Committer: Robert Gemmell 
Committed: Tue Nov 17 11:41:36 2015 +

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/11ac3d9d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e8d16f0..8bb396f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 1.1.2
 1.4.0
 3.4.6
-0.10
+0.11.0
 0.6.0
 4.0.33.Final
 1.3

[2/2] activemq-artemis git commit: merge #242 - ARTEMIS-302 - more work about improving resilience of MDBs and XA

2015-11-17 Thread andytaylor 
merge #242 - ARTEMIS-302 - more work about improving resilience of MDBs and XA


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

Branch: refs/heads/master
Commit: 5b824e1bcf20f7dc6b92cd674bd103e31d5f83d8
Parents: 06b0c31 b1d5076
Author: Andy Taylor 
Authored: Tue Nov 17 15:08:46 2015 +
Committer: Andy Taylor 
Committed: Tue Nov 17 15:08:46 2015 +

--
 .../core/client/impl/ClientSessionImpl.java |  11 +-
 .../core/client/impl/ClientSessionInternal.java |   2 +
 .../core/client/impl/DelegatingSession.java |   4 +
 .../ra/inflow/ActiveMQMessageHandler.java   |  30 +++--
 .../artemis/core/server/impl/QueueImpl.java |  13 +-
 .../core/server/impl/ServerConsumerImpl.java|  46 ---
 .../core/server/impl/ServerSessionImpl.java |  35 -
 ...MDBMultipleHandlersServerDisconnectTest.java | 135 ++-
 .../cluster/failover/FailoverTest.java  |   4 +-
 9 files changed, 206 insertions(+), 74 deletions(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-302 - more work about improving resilience of MDBs and XA

2015-11-17 Thread andytaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 06b0c3119 -> 5b824e1bc


ARTEMIS-302 - more work about improving resilience of MDBs and XA


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

Branch: refs/heads/master
Commit: b1d5076108de3c93aaacc246c4228ad052148a04
Parents: 06b0c31
Author: Clebert Suconic 
Authored: Mon Nov 16 16:06:08 2015 -0500
Committer: Clebert Suconic 
Committed: Mon Nov 16 18:11:44 2015 -0500

--
 .../core/client/impl/ClientSessionImpl.java |  11 +-
 .../core/client/impl/ClientSessionInternal.java |   2 +
 .../core/client/impl/DelegatingSession.java |   4 +
 .../ra/inflow/ActiveMQMessageHandler.java   |  30 +++--
 .../artemis/core/server/impl/QueueImpl.java |  13 +-
 .../core/server/impl/ServerConsumerImpl.java|  46 ---
 .../core/server/impl/ServerSessionImpl.java |  35 -
 ...MDBMultipleHandlersServerDisconnectTest.java | 135 ++-
 .../cluster/failover/FailoverTest.java  |   4 +-
 9 files changed, 206 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1d50761/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 6134784..0a24022 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -532,6 +532,10 @@ public final class ClientSessionImpl implements 
ClientSessionInternal, FailureLi
   rollbackOnly = false;
}
 
+   public void markRollbackOnly() {
+  rollbackOnly = true;
+   }
+
public ClientMessage createMessage(final byte type,
   final boolean durable,
   final long expiration,
@@ -1036,7 +1040,12 @@ public final class ClientSessionImpl implements 
ClientSessionInternal, FailureLi
 
   // we should never throw rollback if we have already prepared
   if (rollbackOnly) {
- ActiveMQClientLogger.LOGGER.commitAfterFailover();
+ if (onePhase) {
+throw new XAException(XAException.XAER_RMFAIL);
+ }
+ else {
+ActiveMQClientLogger.LOGGER.commitAfterFailover();
+ }
   }
 
   // Note - don't need to flush acks since the previous end would have

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1d50761/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
index 06d6024..cd697c0 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
@@ -93,6 +93,8 @@ public interface ClientSessionInternal extends ClientSession {
 
void resetIfNeeded() throws ActiveMQException;
 
+   void markRollbackOnly();
+
/**
 * This is used internally to control and educate the user
 * about using the thread boundaries properly.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1d50761/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
index 2d6f4a4..4d72dc9 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
@@ -141,6 +141,10 @@ public class DelegatingSession implements 
ClientSessionInternal {
   session.close();
}
 
+

svn commit: r972702 - in /websites/production/activemq/content: cache/main.pageCache osgi-support-in-development.html

2015-11-17 Thread buildbot 
Author: buildbot
Date: Tue Nov 17 14:21:36 2015
New Revision: 972702

Log:
Production update by buildbot for activemq

Added:
websites/production/activemq/content/osgi-support-in-development.html
Modified:
websites/production/activemq/content/cache/main.pageCache

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files - no diff available.

Added: websites/production/activemq/content/osgi-support-in-development.html
==
--- websites/production/activemq/content/osgi-support-in-development.html 
(added)
+++ websites/production/activemq/content/osgi-support-in-development.html Tue 
Nov 17 14:21:36 2015
@@ -0,0 +1,138 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+http://activemq.apache.org/styles/site.css; rel="stylesheet" 
type="text/css"/>
+http://activemq.apache.org/styles/type-settings.css; 
rel="stylesheet" type="text/css"/>
+http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/rico.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/site.js"; 
type="text/javascript">
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+
+Apache ActiveMQ  -- OSGi support (in development)
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+
+   
+   
+http://activemq.apache.org; 
title="The most popular and powerful open source Message Broker">ActiveMQ 

+http://www.apache.org; title="The 
Apache Software Foundation">ASF
+   
+
+
+
+  
+OSGi support (in development)
+  
+  
+Download | http://activemq.apache.org/maven/apidocs/index.html;>JavaDocs More... | Source | Forums | Support
+  
+
+
+  
+  
+
+
+Split packages 
(2015-11-17)PackageModulesorg/apache/activemq/artemis/uriartemis-core-clientartemis-jms-clientartemis-serverorg/apache/activemq/artemis/core/protocol/core/impl/wireformatartemis-core-client artemis-serverorg/apache/activemq/artemis/spi/core/protocol 
artemis-core-clientartemis-serverorg/apache/activemq/artemis/core/protocol/core/implartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/transaction/implartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/securityartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/protocolartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/buffers/implartemis-commonsartemis-core-clientorg/apache/activemq/artemis/core/protocol/stompartemis-protocols/artemis-stomp-protocolartemis-serverorg/apache/activemq/artemis/core/server/managementartemis-core-clientartemis-serverorg/apache/activemq/artemis/api/core/managementartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/serverartemis-commons (1 class)artemis-core-client (1 clas
 s)artemis-serverorg/apache/activemq/artemis/spi/core/remotingartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/protocol/coreartemis-core-clientartemis-serverorg/apache/activemq/artemis/utilsartemis-commonsartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/protocol/hornetqartemis-protocols/artemis-hornetq-protocolartemis-protocols/artemis-hqclient-protocolorg/apache/activemq/artemis/api/coreartemis-commonsartemis-core-clientorg/apache/activemq/artemis/core/remoting/impl/nettyartemis-core-clientartemis-serverorg/apache/activemq/artemis/core/settingsartemis-core-clientartemis-server
+
+
+  
+
+  
+https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985;>OverviewIndexNewsNew FeaturesGetting StartedFAQArticlesBooksDownloadhttp://www.apache.org/licenses/;>LicenseSearch
+http://www.google.com/search; style="font-size: 10px;">
+
+
+  
+  
+  
+  
+
+
+Sub Projectshttp://activemq.apache.org/artemis/;>Artemishttp://activemq.apache.org/apollo; title="ActiveMQ 
Apollo">Apollohttp://activemq.apache.org/cms/;>CMShttp://activemq.apache.org/nms/; title="NMS is the 
.Net Messaging API">NMShttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130;>CommunitySupportContributingDiscussion ForumsMailing ListsIRChttp://javabot.evanchooly.com/logs/%23apache-activemq/today; 
rel="nofollow">IRC LogSecurity AdvisoriesSitehttp://www.apache.org/foundation/sponsorship.html;>SponsorshipProjects Using 
ActiveMQUsersTeamThankshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883;>FeaturesAdvisory 
MessageClusteringCross Language ClientsEnterprise Integration 
PatternsJMXJMS to JMS BridgeMasterSlaveMessage GroupsNetworks of BrokersPerformancePersistenceSecurityVirtual DestinationsVisualisationMore ...https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7">ConnectivityAjaxAMQPAxis and CXF SupportC IntegrationC++http://activemq.apache.org/nms/;>C# and

[CONF] Apache ActiveMQ > OSGi support (in development)

2015-11-17 Thread Christian Schneider (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christian Schneider created a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
OSGi support (in development) 
 
 
  
 
 
 
 
 
 
 Split packages (2015-11-17) 
 
 
 
 
Package 
Modules 
 
 
org/apache/activemq/artemis/uri 
 artemis-core-clientartemis-jms-clientartemis-server  
 
 
org/apache/activemq/artemis/core/protocol/core/impl/wireformat 
artemis-core-client artemis-server 
 
 
org/apache/activemq/artemis/spi/core/protocol     
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/core/protocol/core/impl 
artemis-core-clientartemis-server 
 
 
 org/apache/activemq/artemis/core/transaction/impl  
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/core/security 
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/core/protocol 
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/core/buffers/impl 
artemis-commonsartemis-core-client 
 
 
org/apache/activemq/artemis/core/protocol/stomp 
artemis-protocols/artemis-stomp-protocolartemis-server 
 
 
org/apache/activemq/artemis/core/server/management 
 artemis-core-clientartemis-server  
 
 
org/apache/activemq/artemis/api/core/management 
 artemis-core-clientartemis-server  
 
 
org/apache/activemq/artemis/core/server 
artemis-commons (1 class)artemis-core-client (1 class)artemis-server 
 
 
 org/apache/activemq/artemis/spi/core/remoting  
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/core/protocol/core 
artemis-core-clientartemis-server 
 
 
org/apache/activemq/artemis/utils 
 artemis-commonsartemis-core-clientartemis-server  
 
 
org/apache/activemq/artemis/core/protocol/hornetq 
artemis-protocols/artemis-hornetq-protocolartemis-protocols/artemis-hqclient-protocol 
 
 
org/apache/activemq/artemis/api/core 
artemis-commonsartemis-core-client 
 
 
org/apache/activemq/artemis/core/remoting/impl/netty 
 artemis-core-clientartemis-server  
 
 
org/apache/activemq/artemis/core/settings 
artemis-core-clientartemis-server 
 
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: HTTP Protocol Support #532

2015-11-17 Thread Apache Jenkins Server 
See

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

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #532

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is unstable: ActiveMQ-Java7 » ActiveMQ :: HTTP Protocol Support #870

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java7 » ActiveMQ :: RA #870

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is unstable: ActiveMQ-Java7 #870

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is back to normal : ActiveMQ-Java7 » ActiveMQ :: Spring #870

2015-11-17 Thread Apache Jenkins Server 
See

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

2015-11-17 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java7 » ActiveMQ :: Karaf Integration Tests #870

2015-11-17 Thread Apache Jenkins Server 
See

buildbot success in ASF Buildbot on activemq-site-production

2015-11-17 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/3366

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-11-17 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/3365

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