QPID-4390: Introduce a configuration store in java broker allowing runtime modifications and replace existing xml file configuration with json configuration store

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1447646 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 44 insertions, 17 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
index 20d6f98fa6..12f8d801dc 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
@@ -38,14 +38,6 @@ public interface NetworkTransportConfiguration
     // The amount of memory in bytes to allocate to the outgoing buffer
     Integer getSendBufferSize();
 
-    Integer getPort();
-
-    String getHost();
-
-    String getTransport();
-
-    Integer getConnectorProcessors();
-
     InetSocketAddress getAddress();
 
     boolean needClientAuth();
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
index 3f1cd3519b..c8027e143e 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
@@ -258,14 +258,14 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
                     }
                     catch(RuntimeException e)
                     {
-                        LOGGER.error("Error in Acceptor thread on port " + _config.getPort(), e);
+                        LOGGER.error("Error in Acceptor thread on address " + _config.getAddress(), e);
                         closeSocketIfNecessary(socket);
                     }
                     catch(IOException e)
                     {
                         if(!_closed)
                         {
-                            LOGGER.error("Error in Acceptor thread on port " + _config.getPort(), e);
+                            LOGGER.error("Error in Acceptor thread on address " + _config.getAddress(), e);
                             closeSocketIfNecessary(socket);
                             try
                             {
@@ -285,7 +285,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
             {
                 if(LOGGER.isDebugEnabled())
                 {
-                    LOGGER.debug("Acceptor exiting, no new connections will be accepted on port " + _config.getPort());
+                    LOGGER.debug("Acceptor exiting, no new connections will be accepted on address " + _config.getAddress());
                 }
             }
         }
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
index c16e42eb7c..08f7387b75 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -116,12 +116,7 @@ public class QpidTestCase extends TestCase
     
     public QpidTestCase()
     {
-        this("QpidTestCase");
-    }
-
-    public QpidTestCase(String name)
-    {
-        super(name);
+        super();
     }
 
     public void run(TestResult testResult)
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
index d77049c780..14dec8efad 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/TestFileUtils.java
@@ -24,6 +24,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
+import java.io.FileOutputStream;
+
 import junit.framework.TestCase;
 
 import org.apache.qpid.util.FileUtils;
@@ -110,4 +112,42 @@ public class TestFileUtils
         dst.deleteOnExit();
         return dst;
     }
+
+    /**
+     * Creates a temporary file for given test with given suffix in file name.
+     * The given content is stored in the file using UTF-8 encoding.
+     */
+    public static File createTempFile(TestCase testcase, String suffix, String content)
+    {
+        File file = createTempFile(testcase, suffix);
+        if (content != null)
+        {
+            FileOutputStream fos =  null;
+            try
+            {
+                fos = new FileOutputStream(file);
+                fos.write(content.getBytes("UTF-8"));
+                fos.flush();
+            }
+            catch (Exception e)
+            {
+                throw new RuntimeException("Cannot add the content into temp file " + file.getAbsolutePath(), e);
+            }
+            finally
+            {
+                if (fos != null)
+                {
+                    try
+                    {
+                        fos.close();
+                    }
+                    catch (IOException e)
+                    {
+                        throw new RuntimeException("Cannot close output stream into temp file " + file.getAbsolutePath(), e);
+                    }
+                }
+            }
+        }
+        return file;
+    }
 }