Author: jbellis Date: Thu Oct 7 16:11:19 2010 New Revision: 1005511 URL: http://svn.apache.org/viewvc?rev=1005511&view=rev Log: replace javax ConfigurationException with o.a.c.config
Added: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/ConfigurationException.java Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/dht/BootStrapper.java cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java Added: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/ConfigurationException.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/ConfigurationException.java?rev=1005511&view=auto ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/ConfigurationException.java (added) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/ConfigurationException.java Thu Oct 7 16:11:19 2010 @@ -0,0 +1,9 @@ +package org.apache.cassandra.config; + +public class ConfigurationException extends Exception +{ + public ConfigurationException(String message) + { + super(message); + } +} Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1005511&r1=1005510&r2=1005511&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Thu Oct 7 16:11:19 2010 @@ -1170,14 +1170,6 @@ public class DatabaseDescriptor return (int)Math.min(FBUtilities.absoluteFromFraction(v, expectedRows), Integer.MAX_VALUE); } - private static class ConfigurationException extends Exception - { - public ConfigurationException(String message) - { - super(message); - } - } - public static InetAddress getListenAddress() { return listenAddress; Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/dht/BootStrapper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/dht/BootStrapper.java?rev=1005511&r1=1005510&r2=1005511&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/dht/BootStrapper.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/dht/BootStrapper.java Thu Oct 7 16:11:19 2010 @@ -24,13 +24,12 @@ package org.apache.cassandra.dht; import java.io.UnsupportedEncodingException; import java.net.InetAddress; - import javax.naming.ConfigurationException; - import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.commons.lang.ArrayUtils; + import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.net.*; Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=1005511&r1=1005510&r2=1005511&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java Thu Oct 7 16:11:19 2010 @@ -28,7 +28,6 @@ import java.util.*; import java.util.concurrent.*; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.naming.ConfigurationException; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -297,7 +296,7 @@ public class StorageService implements I MessagingService.instance.listen(FBUtilities.getLocalAddress()); } - public synchronized void initServer() throws IOException, ConfigurationException + public synchronized void initServer() throws IOException, org.apache.cassandra.config.ConfigurationException { if (initialized) { Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?rev=1005511&r1=1005510&r2=1005511&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java Thu Oct 7 16:11:19 2010 @@ -27,8 +27,7 @@ import java.util.concurrent.SynchronousQ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.naming.ConfigurationException; - +import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.SystemTable; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; Modified: cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java?rev=1005511&r1=1005510&r2=1005511&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java (original) +++ cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java Thu Oct 7 16:11:19 2010 @@ -24,10 +24,9 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import javax.naming.ConfigurationException; - import org.junit.Test; +import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.dht.Token; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.config.DatabaseDescriptor;