[jboss-cvs] JBoss Messaging SVN: r4789 - in trunk/src: main/org/jboss/messaging/core/config and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 8 09:02:26 EDT 2008
Author: jmesnil
Date: 2008-08-08 09:02:26 -0400 (Fri, 08 Aug 2008)
New Revision: 4789
Modified:
trunk/src/config/jbm-beans.xml
trunk/src/config/jbm-configuration.xml
trunk/src/config/jbm-standalone-beans.xml
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
Log:
renamed configuration property management-enabled to jmx-management-enabled
Modified: trunk/src/config/jbm-beans.xml
===================================================================
--- trunk/src/config/jbm-beans.xml 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/config/jbm-beans.xml 2008-08-08 13:02:26 UTC (rev 4789)
@@ -119,7 +119,7 @@
<inject bean="MBeanServer"/>
</parameter>
<parameter>
- <inject bean="Configuration" property="managementEnabled" />
+ <inject bean="Configuration" property="JMXManagementEnabled" />
</parameter>
</constructor>
</bean>
@@ -130,7 +130,7 @@
<inject bean="MBeanServer"/>
</parameter>
<parameter>
- <inject bean="Configuration" property="managementEnabled" />
+ <inject bean="Configuration" property="JMXManagementEnabled" />
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/config/jbm-configuration.xml 2008-08-08 13:02:26 UTC (rev 4789)
@@ -12,7 +12,7 @@
<security-invalidation-interval>10000</security-invalidation-interval>
- <management-enabled>true</management-enabled>
+ <jmx-management-enabled>true</jmx-management-enabled>
<!-- Remoting configuration -->
Modified: trunk/src/config/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-standalone-beans.xml 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/config/jbm-standalone-beans.xml 2008-08-08 13:02:26 UTC (rev 4789)
@@ -138,7 +138,7 @@
<inject bean="MBeanServer"/>
</parameter>
<parameter>
- <inject bean="Configuration" property="managementEnabled" />
+ <inject bean="Configuration" property="JMXManagementEnabled" />
</parameter>
</constructor>
</bean>
@@ -149,7 +149,7 @@
<inject bean="MBeanServer"/>
</parameter>
<parameter>
- <inject bean="Configuration" property="managementEnabled" />
+ <inject bean="Configuration" property="JMXManagementEnabled" />
</parameter>
</constructor>
</bean>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-08 13:02:26 UTC (rev 4789)
@@ -62,9 +62,9 @@
void setRequireDestinations(boolean require);
- boolean isManagementEnabled();
+ boolean isJMXManagementEnabled();
- void setManagementEnabled(boolean enabled);
+ void setJMXManagementEnabled(boolean enabled);
// Remoting related attributes ----------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-08 13:02:26 UTC (rev 4789)
@@ -61,7 +61,7 @@
public static final boolean DEFAULT_SECURITY_ENABLED = true;
- public static final boolean DEFAULT_MANAGEMENT_ENABLED = true;
+ public static final boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
public static final boolean DEFAULT_SSL_ENABLED = false;
@@ -108,7 +108,7 @@
protected boolean securityEnabled = DEFAULT_SECURITY_ENABLED;
- protected boolean managementEnabled = DEFAULT_MANAGEMENT_ENABLED;
+ protected boolean jmxManagementEnabled = DEFAULT_JMX_MANAGEMENT_ENABLED;
// Journal related attributes
@@ -445,14 +445,14 @@
this.securityEnabled = enabled;
}
- public boolean isManagementEnabled()
+ public boolean isJMXManagementEnabled()
{
- return managementEnabled ;
+ return jmxManagementEnabled ;
}
- public void setManagementEnabled(boolean enabled)
+ public void setJMXManagementEnabled(boolean enabled)
{
- this.managementEnabled = enabled;
+ this.jmxManagementEnabled = enabled;
}
public ConnectionParams getConnectionParams()
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-08 13:02:26 UTC (rev 4789)
@@ -79,7 +79,7 @@
securityEnabled = getBoolean(e, "security-enabled", securityEnabled);
- managementEnabled = getBoolean(e, "management-enabled", managementEnabled);
+ jmxManagementEnabled = getBoolean(e, "jmx-management-enabled", jmxManagementEnabled);
securityInvalidationInterval = getLong(e, "security-invalidation-interval", securityInvalidationInterval);
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-08-08 13:02:26 UTC (rev 4789)
@@ -57,7 +57,7 @@
private MessagingServerManagement server;
private PostOffice postOffice;
private HierarchicalRepository<QueueSettings> queueSettingsRepository;
- private boolean managementEnabled;
+ private boolean jmxManagementEnabled;
// Static --------------------------------------------------------
@@ -84,10 +84,10 @@
// Constructors --------------------------------------------------
public ManagementServiceImpl(final MBeanServer mbeanServer,
- final boolean managementEnabled)
+ final boolean jmxManagementEnabled)
{
this.mbeanServer = mbeanServer;
- this.managementEnabled = managementEnabled;
+ this.jmxManagementEnabled = jmxManagementEnabled;
}
// Public --------------------------------------------------------
@@ -108,7 +108,7 @@
public void registerServer(final MessagingServerManagement server)
throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -123,7 +123,7 @@
public void unregisterServer() throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -137,7 +137,7 @@
public void registerAddress(final SimpleString address) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -153,7 +153,7 @@
public void unregisterAddress(final SimpleString address) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -167,7 +167,7 @@
public void registerQueue(final Queue queue, final SimpleString address,
final StorageManager storageManager) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -185,7 +185,7 @@
public void unregisterQueue(final SimpleString name,
final SimpleString address) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2008-08-08 12:35:50 UTC (rev 4788)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2008-08-08 13:02:26 UTC (rev 4789)
@@ -50,7 +50,7 @@
// Attributes ----------------------------------------------------
public final MBeanServer mbeanServer;
- private final boolean managementEnabled;
+ private final boolean jmxManagementEnabled;
// Static --------------------------------------------------------
@@ -84,10 +84,10 @@
// Constructors --------------------------------------------------
public JMSManagementServiceImpl(final MBeanServer mbeanServer,
- final boolean managementEnabled)
+ final boolean jmxManagementEnabled)
{
this.mbeanServer = mbeanServer;
- this.managementEnabled = managementEnabled;
+ this.jmxManagementEnabled = jmxManagementEnabled;
}
// Public --------------------------------------------------------
@@ -97,7 +97,7 @@
public void registerJMSServer(final JMSServerManager server)
throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -119,7 +119,7 @@
final String jndiBinding, final JMSServerManager server)
throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -131,7 +131,7 @@
public void unregisterQueue(final String name) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -146,7 +146,7 @@
final MessagingServerManagement serverManagement,
final String jndiBinding) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -158,7 +158,7 @@
public void unregisterTopic(final String name) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -173,7 +173,7 @@
final JBossConnectionFactory connectionFactory,
final List<String> bindings) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
@@ -185,7 +185,7 @@
public void unregisterConnectionFactory(final String name) throws Exception
{
- if (!managementEnabled)
+ if (!jmxManagementEnabled)
{
return;
}
More information about the jboss-cvs-commits
mailing list