dejanb

diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 0c269b4..bc914f1 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -1086,7 +1086,21 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
 
     @Override
     public void checkpoint(boolean sync) throws IOException {
-        super.checkpointCleanup(sync);
+        try {

dejanb

/**
 * 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
 *

dejanb

<features name="quickstart-jms-${project.version}"
          xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">

  <repository>mvn:org.apache.camel.karaf/apache-camel/${camel-version}/xml/features</repository>
  <repository>mvn:org.fusesource.fabric/fuse-fabric/${jboss.fuse.bom.version}/xml/features</repository>

  <feature name="quickstart-jms" version="${project.version}" resolver="(obr)">
      <feature version="${camel-version-range}">camel-jms</feature>
      <feature version="${camel-version-range}">camel</feature>

dejanb

    <repository>
      <id>eclipse.m2</id>
      <url>https://repo.eclipse.org/content/groups/releases/</url>
      <releases><enabled>true</enabled></releases>
      <snapshots><enabled>false</enabled></snapshots>
    </repository>

dejanb

    public final void handleTransportFailure(IOException e) throws InterruptedException {
        if (LOG.isTraceEnabled()) {
            LOG.trace(this + " handleTransportFailure: " + e);
        }
        synchronized (reconnectMutex) {
            Transport transport = connectedTransport.getAndSet(null);

            if (transport != null) {

                disposeTransport(transport);

dejanb

diff --git a/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html b/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
index e4df95b..02bbae0 100644
--- a/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
+++ b/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
@@ -43,4 +43,48 @@
       </form>
     </div>
 
+    <div hawtio-slideout="showSubscriberDetails" title="Details">
+      <div class="dialog-body">

dejanb

diff --git a/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html b/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
index e4df95b..f4ae4fa 100644
--- a/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
+++ b/hawtio-web/src/main/webapp/app/activemq/html/durableSubscribers.html
@@ -43,4 +43,48 @@
       </form>
     </div>
 
+    <div hawtio-slideout="showSubscriberDetails" title="Details">
+      <div class="dialog-body">

dejanb

12:32:24,984 | ERROR | Q Broker-1: root | ActiveMQServiceFactory           | 130 - org.jboss.amq.mq-fabric - 6.1.0.redhat-SNAPSHOT | Exception on start: org.springframework.beans.factory.BeanDefinitionStoreException: IOException parsing XML document from class path resource [profile:broker.xml]; nested exception is java.io.FileNotFoundException: class path resource [profile:broker.xml] cannot be opened because it does not exist
org.springframework.beans.factory.BeanDefinitionStoreException: IOException parsing XML document from class path resource [profile:broker.xml]; nested exception is java.io.FileNotFoundException: class path resource [profile:broker.xml] cannot be opened because it does not exist
	at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDefinitionReader.java:341)[116:org.springframework.beans:3.2.4.RELEASE]
	at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDefinitionReader.java:302)[116:org.springframework.bean

dejanb

diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9882edb..8c60c42 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -34,6 +34,8 @@
     <activemq.osgi.import.pkg>
       !org.apache.commons.daemon,
       !org.apache.maven*,
+      !org.apache.activemq.camel*,
+      !org.apache.camel*,

dejanb

    <Call name="addBean">
        <Arg>
            <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
                <Set name="name">karaf</Set>
                <Set name="loginModuleName">karaf</Set>
                <Set name="roleClassNames">
                    <Array type="java.lang.String">
                        <Item>org.apache.karaf.jaas.boot.principal.RolePrincipal</Item>
                    </Array>
                </Set>