Fix activemq-unit-test failure

-- added addConnector() method so new connector can be created for tests
   -- fix zero-byte key store files that cause test failures
   -- fix a invm issue in test

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java

@@ -431,7 +431,7 @@ public class BrokerService implements Service
 
    public TransportConnector addConnector(String bindAddress) throws Exception
    {
-      return null;
+      return addConnector(new URI(bindAddress));
    }
 
    public void setIoExceptionHandler(IOExceptionHandler ioExceptionHandler)
@@ -653,6 +653,8 @@ public class BrokerService implements Service
 
    public TransportConnector addConnector(URI bindAddress) throws Exception
    {
+      Integer port = bindAddress.getPort();
+      this.extraConnectors.add(port);
       return null;
    }
 

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java

@@ -64,11 +64,6 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase
       Set<TransportConfiguration> acceptors0 = serverConfig.getAcceptorConfigurations();
       Iterator<TransportConfiguration> iter0 = acceptors0.iterator();
 
-      while (iter0.hasNext())
-      {
-         System.out.println("===>: " + iter0.next());
-      }
-
       Map<String, AddressSettings> addressSettings = serverConfig.getAddressesSettings();
       String match = "jms.queue.#";
       AddressSettings dlaSettings = new AddressSettings();
@@ -168,7 +163,7 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase
 
       while (iter.hasNext())
       {
-         System.out.println(">: " + iter.next());
+         System.out.println("acceptor =>: " + iter.next());
       }
       server.start();
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java

@@ -107,7 +107,7 @@ public class JmsTestSupport extends CombinationTestSupport {
     }
 
     protected ConnectionFactory createConnectionFactory() throws Exception {
-        return new ActiveMQConnectionFactory("vm://localhost");
+        return new ActiveMQConnectionFactory("tcp://localhost:61616");
     }
 
     protected BrokerService createBroker() throws Exception {