[hornetq-commits] JBoss hornetq SVN: r7968 - in trunk: src/main/org/hornetq/core/management/impl and 3 other directories.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-09-17 18:02:17 -0400 (Thu, 17 Sep 2009)
New Revision: 7968

Modified:
   trunk/src/main/org/hornetq/core/management/HornetQServerControl.java
   trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
   trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
   trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
   trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
   trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
Log:
Adding properties to ServerControl

Modified: trunk/src/main/org/hornetq/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/HornetQServerControl.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/src/main/org/hornetq/core/management/HornetQServerControl.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -60,6 +60,12 @@
    int getJournalMinFiles();
 
    int getJournalMaxAIO();
+   
+   int getJournalCompactMinFiles();
+   
+   int getJournalCompactPercentage();
+   
+   boolean isPersistenceEnabled();
 
    boolean isCreateBindingsDir();
 

Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -171,7 +171,22 @@
    {
       return configuration.getJournalMinFiles();
    }
+   
+   public int getJournalCompactMinFiles()
+   {
+      return configuration.getJournalCompactMinFiles();
+   }
 
+   public int getJournalCompactPercentage()
+   {
+      return configuration.getJournalCompactPercentage();
+   }
+
+   public boolean isPersistenceEnabled()
+   {
+      return configuration.isPersistenceEnabled();
+   }
+
    public String getJournalType()
    {
       return configuration.getJournalType().toString();
@@ -656,4 +671,5 @@
    {
       return configuration.isWildcardRoutingEnabled();
    }
+
 }

Modified: trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -43,7 +43,7 @@
    // Constructors --------------------------------------------------
 
    public ReplicationAwareHornetQServerControlWrapper(final HornetQServerControlImpl localControl,
-                                                        final ReplicationOperationInvoker replicationInvoker) throws Exception
+                                                      final ReplicationOperationInvoker replicationInvoker) throws Exception
    {
       super(ResourceNames.CORE_SERVER, HornetQServerControl.class, replicationInvoker);
 
@@ -71,7 +71,7 @@
    {
       return localControl.getConnectionCount();
    }
-   
+
    public String[] getInterceptorClassNames()
    {
       return localControl.getInterceptorClassNames();
@@ -221,17 +221,17 @@
    {
       return localControl.getConnectors();
    }
-   
+
    public String getConnectorsAsJSON() throws Exception
    {
       return localControl.getConnectorsAsJSON();
    }
-   
+
    public String[] getAddressNames()
    {
       return localControl.getAddressNames();
    }
-   
+
    public String[] getQueueNames()
    {
       return localControl.getQueueNames();
@@ -392,6 +392,21 @@
       return localControl.isWildcardRoutingEnabled();
    }
 
+   public int getJournalCompactMinFiles()
+   {
+      return localControl.getJournalCompactMinFiles();
+   }
+
+   public int getJournalCompactPercentage()
+   {
+      return localControl.getJournalCompactPercentage();
+   }
+
+   public boolean isPersistenceEnabled()
+   {
+      return localControl.isPersistenceEnabled();
+   }
+
    // StandardMBean overrides ---------------------------------------
 
    @Override

Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -119,6 +119,9 @@
       assertEquals(conf.getTransactionTimeoutScanPeriod(), serverControl.getTransactionTimeoutScanPeriod());
       assertEquals(conf.getMessageExpiryScanPeriod(), serverControl.getMessageExpiryScanPeriod());
       assertEquals(conf.getMessageExpiryThreadPriority(), serverControl.getMessageExpiryThreadPriority());
+      assertEquals(conf.getJournalCompactMinFiles(), serverControl.getJournalCompactMinFiles());
+      assertEquals(conf.getJournalCompactPercentage(), serverControl.getJournalCompactPercentage());
+      assertEquals(conf.isPersistenceEnabled(), serverControl.isPersistenceEnabled());
    }
 
    public void testGetConnectors() throws Exception

Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -253,16 +253,6 @@
             return (String)proxy.retrieveAttributeValue("pagingDirectory");
          }
 
-         public int getGlobalPageSize()
-         {
-            return (Integer)proxy.retrieveAttributeValue("globalPageSize");
-         }
-
-         public long getPagingMaxGlobalSizeBytes()
-         {
-            return (Long)proxy.retrieveAttributeValue("pagingMaxGlobalSizeBytes", Long.class);
-         }
-
          public long getQueueActivationTimeout()
          {
             return (Long)proxy.retrieveAttributeValue("queueActivationTimeout", Long.class);
@@ -423,6 +413,21 @@
             return (Integer)proxy.retrieveAttributeValue("AIOBufferTimeout");
          }
 
+         public int getJournalCompactMinFiles()
+         {
+            return (Integer)proxy.retrieveAttributeValue("JournalCompactMinFiles");
+         }
+
+         public int getJournalCompactPercentage()
+         {
+            return (Integer)proxy.retrieveAttributeValue("JournalCompactPercentage");
+         }
+
+         public boolean isPersistenceEnabled()
+         {
+            return (Boolean)proxy.retrieveAttributeValue("PersistenceEnabled");
+         }
+
       };
    }
    // Package protected ---------------------------------------------

Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java	2009-09-17 14:08:00 UTC (rev 7967)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java	2009-09-17 22:02:17 UTC (rev 7968)
@@ -339,18 +339,6 @@
          return null;
       }
 
-      public int getGlobalPageSize()
-      {
-
-         return 0;
-      }
-
-      public long getPagingMaxGlobalSizeBytes()
-      {
-
-         return 0;
-      }
-
       public long getQueueActivationTimeout()
       {
 
@@ -520,29 +508,29 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOBufferSize()
-       */
       public int getAIOBufferSize()
       {
 
          return 0;
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOBufferTimeout()
-       */
       public int getAIOBufferTimeout()
       {
          return 0;
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOFlushOnSync()
-       */
-      public boolean isAIOFlushOnSync()
+      public int getJournalCompactMinFiles()
       {
+         return 0;
+      }
 
+      public int getJournalCompactPercentage()
+      {
+         return 0;
+      }
+
+      public boolean isPersistenceEnabled()
+      {
          return false;
       }