[jboss-cvs] JBoss Messaging SVN: r4103 - in trunk: src/main/org/jboss/messaging/core/config and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 23 06:44:12 EDT 2008
Author: ataylor
Date: 2008-04-23 06:44:12 -0400 (Wed, 23 Apr 2008)
New Revision: 4103
Modified:
trunk/src/etc/jbm-configuration.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/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
Log:
removed unused config attributes
Modified: trunk/src/etc/jbm-configuration.xml
===================================================================
--- trunk/src/etc/jbm-configuration.xml 2008-04-23 08:25:48 UTC (rev 4102)
+++ trunk/src/etc/jbm-configuration.xml 2008-04-23 10:44:12 UTC (rev 4103)
@@ -6,15 +6,6 @@
<!-- The unique id of the server peer - in a cluster each node MUST have a unique value - must be an integer -->
<server-peer-id>0</server-peer-id>
- <!-- The JAAS security domain to use for JBoss Messaging -->
- <security-domain>java:/jaas/messaging</security-domain>
-
- <!-- The periodicity of the message counter manager enquiring on queues for statistics -->
- <message-counter-sample-period>5000</message-counter-sample-period>
-
- <!-- The maximum number of days results to maintain in the message counter history -->
- <default-message-counter-history-day-limit>-1</default-message-counter-history-day-limit>
-
<strict-tck>true</strict-tck>
<clustered>false</clustered>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-23 08:25:48 UTC (rev 4102)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-23 10:44:12 UTC (rev 4103)
@@ -40,14 +40,8 @@
int getMessagingServerID();
- String getSecurityDomain();
-
List<String> getDefaultInterceptors();
- long getMessageCounterSamplePeriod();
-
- Integer getDefaultMessageCounterHistoryDayLimit();
-
Boolean isStrictTck();
Boolean isClustered();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-23 08:25:48 UTC (rev 4102)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-23 10:44:12 UTC (rev 4103)
@@ -53,19 +53,11 @@
public static final int DEFAULT_REQRES_TIMEOUT = 5; // in seconds
public static final boolean DEFAULT_INVM_DISABLED = false;
public static final boolean DEFAULT_SSL_ENABLED = false;
-
- private PropertyChangeSupport propertyChangeSupport;
protected int messagingServerID = 0;
- protected String securityDomain;
-
protected List<String> defaultInterceptors = new ArrayList<String>();
- protected long messageCounterSamplePeriod = (long) 10000;// Default is 1 minute
-
- protected int defaultMessageCounterHistoryDayLimit = 1;
-
protected boolean strictTck = false;
protected boolean clustered = false;
@@ -117,16 +109,6 @@
protected String trustStorePath;
protected String trustStorePassword;
-
- public void addPropertyChangeListener(PropertyChangeListener listener)
- {
- if (propertyChangeSupport == null)
- {
- propertyChangeSupport = new PropertyChangeSupport(this);
- }
- propertyChangeSupport.addPropertyChangeListener(listener);
- }
-
public int getMessagingServerID()
{
return messagingServerID;
@@ -136,39 +118,12 @@
{
this.messagingServerID = id;
}
-
- public String getSecurityDomain()
- {
- return securityDomain;
- }
public List<String> getDefaultInterceptors()
{
return defaultInterceptors;
}
- public long getMessageCounterSamplePeriod()
- {
- return messageCounterSamplePeriod;
- }
-
- public void setMessageCounterSamplePeriod(long messageCounterSamplePeriod)
- {
- if (messageCounterSamplePeriod < 1000)
- {
- throw new IllegalArgumentException("Cannot set MessageCounterSamplePeriod < 1000 ms");
- }
-
- propertyChangeSupport.firePropertyChange("messageCounterSamplePeriod", this.messageCounterSamplePeriod, messageCounterSamplePeriod);
-
- this.messageCounterSamplePeriod = messageCounterSamplePeriod;
- }
-
- public Integer getDefaultMessageCounterHistoryDayLimit()
- {
- return defaultMessageCounterHistoryDayLimit;
- }
-
public Boolean isStrictTck()
{
return strictTck || "true".equalsIgnoreCase(System.getProperty("jboss.messaging.stricttck"));
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-04-23 08:25:48 UTC (rev 4102)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-04-23 10:44:12 UTC (rev 4103)
@@ -57,12 +57,6 @@
messagingServerID = getInteger(e, "server-peer-id", messagingServerID);
- securityDomain = getString(e, "security-domain", securityDomain);
-
- messageCounterSamplePeriod = getLong(e, "message-counter-sample-period", messageCounterSamplePeriod);
-
- defaultMessageCounterHistoryDayLimit = getInteger(e, "default-message-counter-history-day-limit", defaultMessageCounterHistoryDayLimit);
-
strictTck = getBoolean(e, "strict-tck", strictTck);
clustered = getBoolean(e, "clustered", clustered);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-04-23 08:25:48 UTC (rev 4102)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-04-23 10:44:12 UTC (rev 4103)
@@ -52,22 +52,7 @@
{
assertEquals("failed to set ServerPeerId", 10, configuration.getMessagingServerID());
}
-
- public void testSetSecurityDomain() throws Exception
- {
- assertEquals("failed to set security domain", "java:/jaas/messagingtest", configuration.getSecurityDomain());
- }
-
- public void testSetMessageCounterSamplePeriod() throws Exception
- {
- assertEquals("failed to set Message Counter sample period", 50000, configuration.getMessageCounterSamplePeriod());
- }
-
- public void testSetDefaultMessageCounterHistory() throws Exception
- {
- assertEquals("failed to set default message counter history", new Integer(21), configuration.getDefaultMessageCounterHistoryDayLimit());
- }
-
+
public void testSetStrictTck() throws Exception
{
assertEquals("failed to set strict tck", Boolean.TRUE, configuration.isStrictTck());
More information about the jboss-cvs-commits
mailing list