[jboss-cvs] JBoss Messaging SVN: r4757 - in trunk: src/main/org/jboss/messaging/core/config/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 31 07:57:19 EDT 2008
Author: timfox
Date: 2008-07-31 07:57:19 -0400 (Thu, 31 Jul 2008)
New Revision: 4757
Added:
trunk/tests/config/ConfigurationTest-config2.xml
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest2.java
Modified:
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/remoting/TransportType.java
trunk/tests/config/ConfigurationTest-config.xml
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
Log:
Added backup transport, host and port and added new config test
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -81,7 +81,19 @@
int getPort();
void setPort(int port);
-
+
+ TransportType getBackupTransport();
+
+ void setBackupTransport(TransportType transport);
+
+ String getBackupHost();
+
+ void setBackupHost(String host);
+
+ int getBackupPort();
+
+ void setBackupPort(int port);
+
Location getLocation();
String getKeyStorePath();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -89,7 +89,7 @@
public static final int DEFAULT_JOURNAL_MIN_FILES = 10;
- public static final int DEFAULT_MAX_AIO = 5000;
+ public static final int DEFAULT_JOURNAL_MAX_AIO = 5000;
private static final long serialVersionUID = 4077088945050267843L;
@@ -97,7 +97,7 @@
// Attributes -----------------------------------------------------------------------------
protected boolean clustered = DEFAULT_CLUSTERED;
-
+
protected int scheduledThreadPoolMaxSize = DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
protected long securityInvalidationInterval = DEFAULT_SECURITY_INVALIDATION_INTERVAL;
@@ -127,7 +127,7 @@
protected int journalMinFiles = DEFAULT_JOURNAL_MIN_FILES;
- protected int journalMaxAIO = DEFAULT_MAX_AIO;
+ protected int journalMaxAIO = DEFAULT_JOURNAL_MAX_AIO;
// remoting config
@@ -137,6 +137,12 @@
protected int port = DEFAULT_PORT;
+ protected TransportType backupTransport;
+
+ protected String backupHost;
+
+ protected int backupPort;
+
protected final ConnectionParams defaultConnectionParams = new ConnectionParamsImpl();
protected boolean sslEnabled = DEFAULT_SSL_ENABLED;
@@ -224,6 +230,36 @@
this.port = port;
}
+ public TransportType getBackupTransport()
+ {
+ return backupTransport;
+ }
+
+ public void setBackupTransport(TransportType transport)
+ {
+ this.backupTransport = transport;
+ }
+
+ public String getBackupHost()
+ {
+ return backupHost;
+ }
+
+ public void setBackupHost(String host)
+ {
+ this.backupHost = host;
+ }
+
+ public int getBackupPort()
+ {
+ return backupPort;
+ }
+
+ public void setBackupPort(int port)
+ {
+ this.backupPort = port;
+ }
+
public Location getLocation()
{
return new LocationImpl(transport, host, port);
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -80,11 +80,11 @@
securityEnabled = getBoolean(e, "security-enabled", securityEnabled);
securityInvalidationInterval = getLong(e, "security-invalidation-interval", securityInvalidationInterval);
-
- transport = TransportType.valueOf(getString(e, "remoting-transport", TransportType.TCP.toString()));
-
+
// Remoting config
+ transport = TransportType.valueOf(getString(e, "remoting-transport", transport.toString()));
+
host = getString(e, "remoting-host", host);
if (System.getProperty("java.rmi.server.hostname") == null)
@@ -93,7 +93,18 @@
}
port = getInteger(e, "remoting-port", port);
+
+ String sbackupTransport = getString(e, "remoting-backup-transport", null);
+
+ if (sbackupTransport != null)
+ {
+ backupTransport = TransportType.valueOf(sbackupTransport);
+ }
+
+ backupHost = getString(e, "remoting-backup-host", backupHost);
+ backupPort = getInteger(e, "remoting-backup-port", backupPort);
+
int callTimeout = getInteger(e, "remoting-call-timeout", ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
boolean inVMOptimisationEnabled = getBoolean(e, "remoting-enable-invm-optimisation", ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED);
@@ -108,13 +119,13 @@
sslEnabled = getBoolean(e, "remoting-enable-ssl", ConnectionParamsImpl.DEFAULT_SSL_ENABLED);
- keyStorePath = getString(e, "remoting-ssl-keystore-path", null);
+ keyStorePath = getString(e, "remoting-ssl-keystore-path", ConfigurationImpl.DEFAULT_KEYSTORE_PATH);
- keyStorePassword = getString(e, "remoting-ssl-keystore-password", null);
+ keyStorePassword = getString(e, "remoting-ssl-keystore-password", ConfigurationImpl.DEFAULT_KEYSTORE_PASSWORD);
- trustStorePath = getString(e, "remoting-ssl-truststore-path", null);
+ trustStorePath = getString(e, "remoting-ssl-truststore-path", ConfigurationImpl.DEFAULT_TRUSTSTORE_PATH);
- trustStorePassword = getString(e, "remoting-ssl-truststore-password", null);
+ trustStorePassword = getString(e, "remoting-ssl-truststore-password", ConfigurationImpl.DEFAULT_TRUSTSTORE_PASSWORD);
defaultConnectionParams.setCallTimeout(callTimeout);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/TransportType.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/TransportType.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/src/main/org/jboss/messaging/core/remoting/TransportType.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -32,10 +32,4 @@
public enum TransportType
{
TCP, HTTP, INVM;
-
- @Override
- public String toString()
- {
- return super.toString().toLowerCase();
- }
}
Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/tests/config/ConfigurationTest-config.xml 2008-07-31 11:57:19 UTC (rev 4757)
@@ -1,15 +1,17 @@
<deployment>
<configuration>
<clustered>true</clustered>
- <scheduled-max-pool-size>12345</scheduled-max-pool-size>
- <max-pool-size>54321</max-pool-size>
+ <scheduled-max-pool-size>12345</scheduled-max-pool-size>
<require-destinations>false</require-destinations>
<security-enabled>false</security-enabled>
<security-invalidation-interval>5423</security-invalidation-interval>
<remoting-transport>HTTP</remoting-transport>
<remoting-bind-address>5431</remoting-bind-address>
<remoting-host>blahhost</remoting-host>
- <remoting-port>6540</remoting-port>
+ <remoting-port>6540</remoting-port>
+ <remoting-backup-transport>TCP</remoting-backup-transport>
+ <remoting-backup-host>backuphost</remoting-backup-host>
+ <remoting-backup-port>7540</remoting-backup-port>
<remoting-call-timeout>7654</remoting-call-timeout>
<remoting-enable-invm-optimisation>false</remoting-enable-invm-optimisation>
<remoting-tcp-nodelay>false</remoting-tcp-nodelay>
Added: trunk/tests/config/ConfigurationTest-config2.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config2.xml (rev 0)
+++ trunk/tests/config/ConfigurationTest-config2.xml 2008-07-31 11:57:19 UTC (rev 4757)
@@ -0,0 +1,5 @@
+<deployment>
+ <configuration>
+ <!-- just use all the defaults -->
+ </configuration>
+</deployment>
\ No newline at end of file
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -76,7 +76,7 @@
assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL, conf.isJournalSyncNonTransactional());
assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_FILE_SIZE, conf.getJournalFileSize());
assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MIN_FILES, conf.getJournalMinFiles());
- assertEquals(ConfigurationImpl.DEFAULT_MAX_AIO, conf.getJournalMaxAIO());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MAX_AIO, conf.getJournalMaxAIO());
}
public void testSetGetAttributes()
@@ -187,7 +187,7 @@
conf.setTransport(TransportType.TCP);
conf.setHost("blahhost");
conf.setPort(1234);
- assertEquals("tcp://blahhost:1234", conf.getLocation().getLocation());
+ assertEquals("TCP://blahhost:1234", conf.getLocation().getLocation());
}
public void testGetSetInterceptors()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2008-07-31 09:41:33 UTC (rev 4756)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -39,7 +39,10 @@
assertEquals(12345, conf.getScheduledThreadPoolMaxSize());
assertEquals("blahhost", conf.getHost());
assertEquals(TransportType.HTTP, conf.getTransport());
- assertEquals(6540, conf.getPort());
+ assertEquals(6540, conf.getPort());
+ assertEquals("backuphost", conf.getBackupHost());
+ assertEquals(TransportType.TCP, conf.getBackupTransport());
+ assertEquals(7540, conf.getBackupPort());
assertEquals(5423, conf.getSecurityInvalidationInterval());
assertEquals(false, conf.isRequireDestinations());
assertEquals(false, conf.isSecurityEnabled());
Added: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest2.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest2.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest2.java 2008-07-31 11:57:19 UTC (rev 4757)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.tests.unit.core.config.impl;
+
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.config.impl.FileConfiguration;
+
+/**
+ *
+ * A FileConfigurationTest2
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class FileConfigurationTest2 extends ConfigurationImplTest
+{
+ public void testDefaults()
+ {
+ assertEquals(ConfigurationImpl.DEFAULT_CLUSTERED, conf.isClustered());
+ assertEquals(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, conf.getScheduledThreadPoolMaxSize());
+ assertEquals(ConfigurationImpl.DEFAULT_HOST, conf.getHost());
+ assertEquals(ConfigurationImpl.DEFAULT_TRANSPORT, conf.getTransport());
+ assertEquals(ConfigurationImpl.DEFAULT_PORT, conf.getPort());
+ assertEquals(null, conf.getBackupHost());
+ assertEquals(null, conf.getBackupTransport());
+ assertEquals(0, conf.getBackupPort());
+ assertEquals(ConfigurationImpl.DEFAULT_SECURITY_INVALIDATION_INTERVAL, conf.getSecurityInvalidationInterval());
+ assertEquals(ConfigurationImpl.DEFAULT_REQUIRE_DESTINATIONS, conf.isRequireDestinations());
+ assertEquals(ConfigurationImpl.DEFAULT_SECURITY_ENABLED, conf.isSecurityEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_SSL_ENABLED, conf.isSSLEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_KEYSTORE_PATH, conf.getKeyStorePath());
+ assertEquals(ConfigurationImpl.DEFAULT_KEYSTORE_PASSWORD, conf.getKeyStorePassword());
+ assertEquals(ConfigurationImpl.DEFAULT_TRUSTSTORE_PATH, conf.getTrustStorePath());
+ assertEquals(ConfigurationImpl.DEFAULT_TRUSTSTORE_PASSWORD, conf.getTrustStorePassword());
+ assertEquals(ConfigurationImpl.DEFAULT_BINDINGS_DIRECTORY, conf.getBindingsDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR, conf.isCreateBindingsDir());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_DIR, conf.getJournalDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_CREATE_JOURNAL_DIR, conf.isCreateJournalDir());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE.toString(), conf.getJournalType().toString());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_TRANSACTIONAL, conf.isJournalSyncTransactional());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL, conf.isJournalSyncNonTransactional());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_FILE_SIZE, conf.getJournalFileSize());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MIN_FILES, conf.getJournalMinFiles());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MAX_AIO, conf.getJournalMaxAIO());
+
+ assertEquals(ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED, conf.getConnectionParams().isInVMOptimisationEnabled());
+ assertEquals(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT, conf.getConnectionParams().getCallTimeout());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_NODELAY, conf.getConnectionParams().isTcpNoDelay());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_RECEIVE_BUFFER_SIZE, conf.getConnectionParams().getTcpReceiveBufferSize());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_SEND_BUFFER_SIZE, conf.getConnectionParams().getTcpSendBufferSize());
+ assertEquals(ConnectionParamsImpl.DEFAULT_PING_INTERVAL, conf.getConnectionParams().getPingInterval());
+ assertEquals(0, conf.getInterceptorClassNames().size());
+ assertEquals(0, conf.getAcceptorFactoryClassNames().size());
+ }
+
+ // Protected ---------------------------------------------------------------------------------------------
+
+ protected Configuration createConfiguration() throws Exception
+ {
+ FileConfiguration fc = new FileConfiguration();
+
+ fc.setConfigurationUrl("ConfigurationTest-config2.xml");
+
+ fc.start();
+
+ return fc;
+ }
+
+}
+
More information about the jboss-cvs-commits
mailing list