dejanb

diff --git a/fabric/fabric8-karaf/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/fabric/fabric8-karaf/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
index 6cc51f2..15b9173 100644
--- a/fabric/fabric8-karaf/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/fabric/fabric8-karaf/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -91,7 +91,7 @@ org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.rep
 org.ops4j.pax.url.mvn.repositories= \
     http://repo1.maven.org/maven2@id=maven.central.repo, \
     https://repository.jboss.org/nexus/content/repositories/fs-releases@id=fusesource.release.repo, \
-    https://repository.jboss.org/nexus/content/repositories/fs-ea@id=fusesource.ea.repo, \
+    https://repository.jboss.org/nexus/content/repositories/ea@id=fusesource.ea.repo, \

dejanb

diff --git a/esb/esb-assembly/jboss-fuse-medium/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/esb/esb-assembly/jboss-fuse-medium/src/main/filt
index a1196f3..691e316 100644
--- a/esb/esb-assembly/jboss-fuse-medium/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/esb/esb-assembly/jboss-fuse-medium/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -24,7 +24,7 @@ featuresRepositories=\
         mvn:org.apache.karaf.assemblies.features/enterprise/${karaf-version}/xml/features,\
         mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features,\
         mvn:org.apache.camel.karaf/apache-camel/${camel-version}/xml/features,\
-        mvn:org.apache.activemq/activemq-karaf/${activemq-version}/xml/features,\
+        mvn:org.apache.activemq/activemq-karaf/${activemq-version}/xml/features-core,\

dejanb

<property name="authenticate" value="false"/>

dejanb

<property name="authenticate" value="true"/>

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

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java b/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
index 9db3fa0..94dfbd0 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.broker;
 
 import java.net.URI;
+import java.util.Map;
 import java.util.Set;

dejanb

16:00:20,111 | INFO  | 0.0/0.0.0.0:2181 | NIOServerCnxn                    | e.zookeeper.server.NIOServerCnxn 1434 | 42 - org.fusesource.fabric.fabric-zookeeper - 1.0.0.SNAPSHOT | Closed socket connection for client /192.168.1.107:60437 (no session established for client)
16:00:20,892 | INFO  | 0.0/0.0.0.0:2181 | NIOServerCnxn                    | per.server.NIOServerCnxn$Factory  250 | 42 - org.fusesource.fabric.fabric-zookeeper - 1.0.0.SNAPSHOT | Accepted socket connection from /192.168.1.107:60438
16:00:20,895 | INFO  | 0.0/0.0.0.0:2181 | NIOServerCnxn                    | e.zookeeper.server.NIOServerCnxn  751 | 42 - org.fusesource.fabric.fabric-zookeeper - 1.0.0.SNAPSHOT | Refusing session request for client /192.168.1.107:60438 as it has seen zxid 0x76 our last zxid is 0x5e client must try another server
16:00:20,896 | INFO  | 0.0/0.0.0.0:2181 | NIOServerCnxn                    | e.zookeeper.server.NIOServerCnxn 1434 | 42 - org.fusesource.fabric.fabric-zookeeper - 1.0.0.SNAPSHOT | Closed socket connectio

dejanb

shell:source mvn:org.fusesource.fon/fon-distro/1.0-SNAPSHOT/karaf/installer

fabric:create-profile --parents default broker

zk:create -r /fabric/configs/versions/base/profiles/broker/org.fusesource.fabric.agent/repository.activemq mvn:org.apache.activemq/activemq-karaf/5.5.0/xml/features
zk:create -r /fabric/configs/versions/base/profiles/broker/org.fusesource.fabric.agent/repository.karaf mvn:org.apache.karaf.assemblies.features/standard/2.2.1-SNAPSHOT/xml/features
zk:create -r /fabric/configs/versions/base/profiles/broker/org.fusesource.fabric.agent/feature.amq activemq-blueprint/5.5.0
zk:create -r /fabric/configs/versions/base/profiles/broker/org.fusesource.fabric.agent/bundle.config blueprint:file:/workspace/forge/activemq.xml

dejanb

shell:source mvn:org.fusesource.fon/fon-distro/1.0-SNAPSHOT/karaf/installer
shell:source mvn:org.fusesource.fon/fon-distro/1.0-SNAPSHOT/karaf/activemq 5.5.0

fabric:create-agent --profile activemq --parent root broker

fabric:connect broker

dejanb

diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
index 6a83016..8a39703 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableUnsubscribeTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.usecases;
 import java.lang.management.ManagementFactory;
 
 import javax.jms.Connection;
+import javax.jms.MessageProducer;
 import javax.jms.Session;