diff --git a/build.xml b/build.xml index b3048f3d..523dddad 100644 --- a/build.xml +++ b/build.xml @@ -7,9 +7,11 @@ - + + + @@ -32,6 +34,7 @@ + @@ -49,6 +52,7 @@ + @@ -78,6 +82,26 @@ + + + + + + + + + + + + + + + + + + + @@ -98,7 +122,6 @@ - Copyright © 2000-${year} ${copyright.holder}. All Rights Reserved. @@ -109,34 +132,16 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -144,8 +149,8 @@ - - + + @@ -160,12 +165,11 @@ - + - - - + + @@ -175,31 +179,4 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/java/com/samskivert/Log.java b/src/main/java/com/samskivert/Log.java similarity index 100% rename from src/java/com/samskivert/Log.java rename to src/main/java/com/samskivert/Log.java diff --git a/src/java/com/samskivert/Utils.gwt.xml b/src/main/java/com/samskivert/Utils.gwt.xml similarity index 100% rename from src/java/com/samskivert/Utils.gwt.xml rename to src/main/java/com/samskivert/Utils.gwt.xml diff --git a/src/java/com/samskivert/annotation/ReplacedBy.java b/src/main/java/com/samskivert/annotation/ReplacedBy.java similarity index 100% rename from src/java/com/samskivert/annotation/ReplacedBy.java rename to src/main/java/com/samskivert/annotation/ReplacedBy.java diff --git a/src/java/com/samskivert/io/ByteArrayOutInputStream.java b/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java similarity index 100% rename from src/java/com/samskivert/io/ByteArrayOutInputStream.java rename to src/main/java/com/samskivert/io/ByteArrayOutInputStream.java diff --git a/src/java/com/samskivert/io/ExtensiblePrintStream.java b/src/main/java/com/samskivert/io/ExtensiblePrintStream.java similarity index 100% rename from src/java/com/samskivert/io/ExtensiblePrintStream.java rename to src/main/java/com/samskivert/io/ExtensiblePrintStream.java diff --git a/src/java/com/samskivert/io/PersistenceException.java b/src/main/java/com/samskivert/io/PersistenceException.java similarity index 100% rename from src/java/com/samskivert/io/PersistenceException.java rename to src/main/java/com/samskivert/io/PersistenceException.java diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/main/java/com/samskivert/io/StreamUtil.java similarity index 100% rename from src/java/com/samskivert/io/StreamUtil.java rename to src/main/java/com/samskivert/io/StreamUtil.java diff --git a/src/java/com/samskivert/io/package.html b/src/main/java/com/samskivert/io/package.html similarity index 100% rename from src/java/com/samskivert/io/package.html rename to src/main/java/com/samskivert/io/package.html diff --git a/src/java/com/samskivert/jdbc/AutoCloseOperation.java b/src/main/java/com/samskivert/jdbc/AutoCloseOperation.java similarity index 100% rename from src/java/com/samskivert/jdbc/AutoCloseOperation.java rename to src/main/java/com/samskivert/jdbc/AutoCloseOperation.java diff --git a/src/java/com/samskivert/jdbc/BaseLiaison.java b/src/main/java/com/samskivert/jdbc/BaseLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/BaseLiaison.java rename to src/main/java/com/samskivert/jdbc/BaseLiaison.java diff --git a/src/java/com/samskivert/jdbc/ColumnDefinition.java b/src/main/java/com/samskivert/jdbc/ColumnDefinition.java similarity index 100% rename from src/java/com/samskivert/jdbc/ColumnDefinition.java rename to src/main/java/com/samskivert/jdbc/ColumnDefinition.java diff --git a/src/java/com/samskivert/jdbc/ConnectionProvider.java b/src/main/java/com/samskivert/jdbc/ConnectionProvider.java similarity index 100% rename from src/java/com/samskivert/jdbc/ConnectionProvider.java rename to src/main/java/com/samskivert/jdbc/ConnectionProvider.java diff --git a/src/java/com/samskivert/jdbc/DataSourceConnectionProvider.java b/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java similarity index 100% rename from src/java/com/samskivert/jdbc/DataSourceConnectionProvider.java rename to src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java diff --git a/src/java/com/samskivert/jdbc/DatabaseLiaison.java b/src/main/java/com/samskivert/jdbc/DatabaseLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/DatabaseLiaison.java rename to src/main/java/com/samskivert/jdbc/DatabaseLiaison.java diff --git a/src/java/com/samskivert/jdbc/DefaultLiaison.java b/src/main/java/com/samskivert/jdbc/DefaultLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/DefaultLiaison.java rename to src/main/java/com/samskivert/jdbc/DefaultLiaison.java diff --git a/src/java/com/samskivert/jdbc/HsqldbLiaison.java b/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/HsqldbLiaison.java rename to src/main/java/com/samskivert/jdbc/HsqldbLiaison.java diff --git a/src/java/com/samskivert/jdbc/JDBCUtil.java b/src/main/java/com/samskivert/jdbc/JDBCUtil.java similarity index 100% rename from src/java/com/samskivert/jdbc/JDBCUtil.java rename to src/main/java/com/samskivert/jdbc/JDBCUtil.java diff --git a/src/java/com/samskivert/jdbc/JORARepository.java b/src/main/java/com/samskivert/jdbc/JORARepository.java similarity index 100% rename from src/java/com/samskivert/jdbc/JORARepository.java rename to src/main/java/com/samskivert/jdbc/JORARepository.java diff --git a/src/java/com/samskivert/jdbc/LiaisonRegistry.java b/src/main/java/com/samskivert/jdbc/LiaisonRegistry.java similarity index 100% rename from src/java/com/samskivert/jdbc/LiaisonRegistry.java rename to src/main/java/com/samskivert/jdbc/LiaisonRegistry.java diff --git a/src/java/com/samskivert/jdbc/MySQLLiaison.java b/src/main/java/com/samskivert/jdbc/MySQLLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/MySQLLiaison.java rename to src/main/java/com/samskivert/jdbc/MySQLLiaison.java diff --git a/src/java/com/samskivert/jdbc/PostgreSQLLiaison.java b/src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java similarity index 100% rename from src/java/com/samskivert/jdbc/PostgreSQLLiaison.java rename to src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java diff --git a/src/java/com/samskivert/jdbc/Repository.java b/src/main/java/com/samskivert/jdbc/Repository.java similarity index 100% rename from src/java/com/samskivert/jdbc/Repository.java rename to src/main/java/com/samskivert/jdbc/Repository.java diff --git a/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java b/src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java similarity index 100% rename from src/java/com/samskivert/jdbc/RepositoryListenerUnit.java rename to src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java diff --git a/src/java/com/samskivert/jdbc/RepositoryUnit.java b/src/main/java/com/samskivert/jdbc/RepositoryUnit.java similarity index 100% rename from src/java/com/samskivert/jdbc/RepositoryUnit.java rename to src/main/java/com/samskivert/jdbc/RepositoryUnit.java diff --git a/src/java/com/samskivert/jdbc/ResultUnit.java b/src/main/java/com/samskivert/jdbc/ResultUnit.java similarity index 100% rename from src/java/com/samskivert/jdbc/ResultUnit.java rename to src/main/java/com/samskivert/jdbc/ResultUnit.java diff --git a/src/java/com/samskivert/jdbc/SimpleRepository.java b/src/main/java/com/samskivert/jdbc/SimpleRepository.java similarity index 100% rename from src/java/com/samskivert/jdbc/SimpleRepository.java rename to src/main/java/com/samskivert/jdbc/SimpleRepository.java diff --git a/src/java/com/samskivert/jdbc/StaticConnectionProvider.java b/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java similarity index 100% rename from src/java/com/samskivert/jdbc/StaticConnectionProvider.java rename to src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java diff --git a/src/java/com/samskivert/jdbc/TransitionRepository.java b/src/main/java/com/samskivert/jdbc/TransitionRepository.java similarity index 100% rename from src/java/com/samskivert/jdbc/TransitionRepository.java rename to src/main/java/com/samskivert/jdbc/TransitionRepository.java diff --git a/src/java/com/samskivert/jdbc/WriteOnlyUnit.java b/src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java similarity index 100% rename from src/java/com/samskivert/jdbc/WriteOnlyUnit.java rename to src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java diff --git a/src/java/com/samskivert/jdbc/jora/Cursor.java b/src/main/java/com/samskivert/jdbc/jora/Cursor.java similarity index 100% rename from src/java/com/samskivert/jdbc/jora/Cursor.java rename to src/main/java/com/samskivert/jdbc/jora/Cursor.java diff --git a/src/java/com/samskivert/jdbc/jora/DataTransferError.java b/src/main/java/com/samskivert/jdbc/jora/DataTransferError.java similarity index 100% rename from src/java/com/samskivert/jdbc/jora/DataTransferError.java rename to src/main/java/com/samskivert/jdbc/jora/DataTransferError.java diff --git a/src/java/com/samskivert/jdbc/jora/FieldDescriptor.java b/src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java similarity index 100% rename from src/java/com/samskivert/jdbc/jora/FieldDescriptor.java rename to src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java diff --git a/src/java/com/samskivert/jdbc/jora/FieldMask.java b/src/main/java/com/samskivert/jdbc/jora/FieldMask.java similarity index 100% rename from src/java/com/samskivert/jdbc/jora/FieldMask.java rename to src/main/java/com/samskivert/jdbc/jora/FieldMask.java diff --git a/src/java/com/samskivert/jdbc/jora/README b/src/main/java/com/samskivert/jdbc/jora/README similarity index 100% rename from src/java/com/samskivert/jdbc/jora/README rename to src/main/java/com/samskivert/jdbc/jora/README diff --git a/src/java/com/samskivert/jdbc/jora/Table.java b/src/main/java/com/samskivert/jdbc/jora/Table.java similarity index 100% rename from src/java/com/samskivert/jdbc/jora/Table.java rename to src/main/java/com/samskivert/jdbc/jora/Table.java diff --git a/src/java/com/samskivert/jdbc/jora/package.html b/src/main/java/com/samskivert/jdbc/jora/package.html similarity index 100% rename from src/java/com/samskivert/jdbc/jora/package.html rename to src/main/java/com/samskivert/jdbc/jora/package.html diff --git a/src/java/com/samskivert/jdbc/package.html b/src/main/java/com/samskivert/jdbc/package.html similarity index 100% rename from src/java/com/samskivert/jdbc/package.html rename to src/main/java/com/samskivert/jdbc/package.html diff --git a/src/java/com/samskivert/net/AttachableURLFactory.java b/src/main/java/com/samskivert/net/AttachableURLFactory.java similarity index 100% rename from src/java/com/samskivert/net/AttachableURLFactory.java rename to src/main/java/com/samskivert/net/AttachableURLFactory.java diff --git a/src/java/com/samskivert/net/HttpPostUtil.java b/src/main/java/com/samskivert/net/HttpPostUtil.java similarity index 100% rename from src/java/com/samskivert/net/HttpPostUtil.java rename to src/main/java/com/samskivert/net/HttpPostUtil.java diff --git a/src/java/com/samskivert/net/MACUtil.java b/src/main/java/com/samskivert/net/MACUtil.java similarity index 100% rename from src/java/com/samskivert/net/MACUtil.java rename to src/main/java/com/samskivert/net/MACUtil.java diff --git a/src/java/com/samskivert/net/MailUtil.java b/src/main/java/com/samskivert/net/MailUtil.java similarity index 100% rename from src/java/com/samskivert/net/MailUtil.java rename to src/main/java/com/samskivert/net/MailUtil.java diff --git a/src/java/com/samskivert/net/PathUtil.java b/src/main/java/com/samskivert/net/PathUtil.java similarity index 100% rename from src/java/com/samskivert/net/PathUtil.java rename to src/main/java/com/samskivert/net/PathUtil.java diff --git a/src/java/com/samskivert/net/cddb/CDDB.java b/src/main/java/com/samskivert/net/cddb/CDDB.java similarity index 100% rename from src/java/com/samskivert/net/cddb/CDDB.java rename to src/main/java/com/samskivert/net/cddb/CDDB.java diff --git a/src/java/com/samskivert/net/cddb/CDDBException.java b/src/main/java/com/samskivert/net/cddb/CDDBException.java similarity index 100% rename from src/java/com/samskivert/net/cddb/CDDBException.java rename to src/main/java/com/samskivert/net/cddb/CDDBException.java diff --git a/src/java/com/samskivert/net/cddb/CDDBProtocol.java b/src/main/java/com/samskivert/net/cddb/CDDBProtocol.java similarity index 100% rename from src/java/com/samskivert/net/cddb/CDDBProtocol.java rename to src/main/java/com/samskivert/net/cddb/CDDBProtocol.java diff --git a/src/java/com/samskivert/net/cddb/CDDBTest.java b/src/main/java/com/samskivert/net/cddb/CDDBTest.java similarity index 100% rename from src/java/com/samskivert/net/cddb/CDDBTest.java rename to src/main/java/com/samskivert/net/cddb/CDDBTest.java diff --git a/src/java/com/samskivert/net/cddb/package.html b/src/main/java/com/samskivert/net/cddb/package.html similarity index 100% rename from src/java/com/samskivert/net/cddb/package.html rename to src/main/java/com/samskivert/net/cddb/package.html diff --git a/src/java/com/samskivert/net/package.html b/src/main/java/com/samskivert/net/package.html similarity index 100% rename from src/java/com/samskivert/net/package.html rename to src/main/java/com/samskivert/net/package.html diff --git a/src/java/com/samskivert/overview.html b/src/main/java/com/samskivert/overview.html similarity index 100% rename from src/java/com/samskivert/overview.html rename to src/main/java/com/samskivert/overview.html diff --git a/src/java/com/samskivert/package.html b/src/main/java/com/samskivert/package.html similarity index 100% rename from src/java/com/samskivert/package.html rename to src/main/java/com/samskivert/package.html diff --git a/src/java/com/samskivert/servlet/HttpErrorException.java b/src/main/java/com/samskivert/servlet/HttpErrorException.java similarity index 100% rename from src/java/com/samskivert/servlet/HttpErrorException.java rename to src/main/java/com/samskivert/servlet/HttpErrorException.java diff --git a/src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java b/src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java similarity index 100% rename from src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java rename to src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java diff --git a/src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java similarity index 100% rename from src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java rename to src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java diff --git a/src/java/com/samskivert/servlet/MessageManager.java b/src/main/java/com/samskivert/servlet/MessageManager.java similarity index 100% rename from src/java/com/samskivert/servlet/MessageManager.java rename to src/main/java/com/samskivert/servlet/MessageManager.java diff --git a/src/java/com/samskivert/servlet/RedirectException.java b/src/main/java/com/samskivert/servlet/RedirectException.java similarity index 100% rename from src/java/com/samskivert/servlet/RedirectException.java rename to src/main/java/com/samskivert/servlet/RedirectException.java diff --git a/src/java/com/samskivert/servlet/Site.java b/src/main/java/com/samskivert/servlet/Site.java similarity index 100% rename from src/java/com/samskivert/servlet/Site.java rename to src/main/java/com/samskivert/servlet/Site.java diff --git a/src/java/com/samskivert/servlet/SiteIdentifier.java b/src/main/java/com/samskivert/servlet/SiteIdentifier.java similarity index 100% rename from src/java/com/samskivert/servlet/SiteIdentifier.java rename to src/main/java/com/samskivert/servlet/SiteIdentifier.java diff --git a/src/java/com/samskivert/servlet/SiteResourceLoader.java b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java similarity index 100% rename from src/java/com/samskivert/servlet/SiteResourceLoader.java rename to src/main/java/com/samskivert/servlet/SiteResourceLoader.java diff --git a/src/java/com/samskivert/servlet/package.html b/src/main/java/com/samskivert/servlet/package.html similarity index 100% rename from src/java/com/samskivert/servlet/package.html rename to src/main/java/com/samskivert/servlet/package.html diff --git a/src/java/com/samskivert/servlet/user/AuthenticationFailedException.java b/src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java similarity index 100% rename from src/java/com/samskivert/servlet/user/AuthenticationFailedException.java rename to src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java diff --git a/src/java/com/samskivert/servlet/user/Authenticator.java b/src/main/java/com/samskivert/servlet/user/Authenticator.java similarity index 100% rename from src/java/com/samskivert/servlet/user/Authenticator.java rename to src/main/java/com/samskivert/servlet/user/Authenticator.java diff --git a/src/java/com/samskivert/servlet/user/InvalidPasswordException.java b/src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java similarity index 100% rename from src/java/com/samskivert/servlet/user/InvalidPasswordException.java rename to src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java diff --git a/src/java/com/samskivert/servlet/user/InvalidUsernameException.java b/src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java similarity index 100% rename from src/java/com/samskivert/servlet/user/InvalidUsernameException.java rename to src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java diff --git a/src/java/com/samskivert/servlet/user/NoSuchUserException.java b/src/main/java/com/samskivert/servlet/user/NoSuchUserException.java similarity index 100% rename from src/java/com/samskivert/servlet/user/NoSuchUserException.java rename to src/main/java/com/samskivert/servlet/user/NoSuchUserException.java diff --git a/src/java/com/samskivert/servlet/user/Password.java b/src/main/java/com/samskivert/servlet/user/Password.java similarity index 100% rename from src/java/com/samskivert/servlet/user/Password.java rename to src/main/java/com/samskivert/servlet/user/Password.java diff --git a/src/java/com/samskivert/servlet/user/User.java b/src/main/java/com/samskivert/servlet/user/User.java similarity index 100% rename from src/java/com/samskivert/servlet/user/User.java rename to src/main/java/com/samskivert/servlet/user/User.java diff --git a/src/java/com/samskivert/servlet/user/UserExistsException.java b/src/main/java/com/samskivert/servlet/user/UserExistsException.java similarity index 100% rename from src/java/com/samskivert/servlet/user/UserExistsException.java rename to src/main/java/com/samskivert/servlet/user/UserExistsException.java diff --git a/src/java/com/samskivert/servlet/user/UserManager.java b/src/main/java/com/samskivert/servlet/user/UserManager.java similarity index 100% rename from src/java/com/samskivert/servlet/user/UserManager.java rename to src/main/java/com/samskivert/servlet/user/UserManager.java diff --git a/src/java/com/samskivert/servlet/user/UserRepository.java b/src/main/java/com/samskivert/servlet/user/UserRepository.java similarity index 100% rename from src/java/com/samskivert/servlet/user/UserRepository.java rename to src/main/java/com/samskivert/servlet/user/UserRepository.java diff --git a/src/java/com/samskivert/servlet/user/UserUtil.java b/src/main/java/com/samskivert/servlet/user/UserUtil.java similarity index 100% rename from src/java/com/samskivert/servlet/user/UserUtil.java rename to src/main/java/com/samskivert/servlet/user/UserUtil.java diff --git a/src/java/com/samskivert/servlet/user/Username.java b/src/main/java/com/samskivert/servlet/user/Username.java similarity index 100% rename from src/java/com/samskivert/servlet/user/Username.java rename to src/main/java/com/samskivert/servlet/user/Username.java diff --git a/src/java/com/samskivert/servlet/user/package.html b/src/main/java/com/samskivert/servlet/user/package.html similarity index 100% rename from src/java/com/samskivert/servlet/user/package.html rename to src/main/java/com/samskivert/servlet/user/package.html diff --git a/src/java/com/samskivert/servlet/util/CookieUtil.java b/src/main/java/com/samskivert/servlet/util/CookieUtil.java similarity index 100% rename from src/java/com/samskivert/servlet/util/CookieUtil.java rename to src/main/java/com/samskivert/servlet/util/CookieUtil.java diff --git a/src/java/com/samskivert/servlet/util/DataValidationException.java b/src/main/java/com/samskivert/servlet/util/DataValidationException.java similarity index 100% rename from src/java/com/samskivert/servlet/util/DataValidationException.java rename to src/main/java/com/samskivert/servlet/util/DataValidationException.java diff --git a/src/java/com/samskivert/servlet/util/ExceptionMap.java b/src/main/java/com/samskivert/servlet/util/ExceptionMap.java similarity index 100% rename from src/java/com/samskivert/servlet/util/ExceptionMap.java rename to src/main/java/com/samskivert/servlet/util/ExceptionMap.java diff --git a/src/java/com/samskivert/servlet/util/FriendlyException.java b/src/main/java/com/samskivert/servlet/util/FriendlyException.java similarity index 100% rename from src/java/com/samskivert/servlet/util/FriendlyException.java rename to src/main/java/com/samskivert/servlet/util/FriendlyException.java diff --git a/src/java/com/samskivert/servlet/util/HTMLUtil.java b/src/main/java/com/samskivert/servlet/util/HTMLUtil.java similarity index 100% rename from src/java/com/samskivert/servlet/util/HTMLUtil.java rename to src/main/java/com/samskivert/servlet/util/HTMLUtil.java diff --git a/src/java/com/samskivert/servlet/util/ParameterUtil.java b/src/main/java/com/samskivert/servlet/util/ParameterUtil.java similarity index 100% rename from src/java/com/samskivert/servlet/util/ParameterUtil.java rename to src/main/java/com/samskivert/servlet/util/ParameterUtil.java diff --git a/src/java/com/samskivert/servlet/util/RequestUtils.java b/src/main/java/com/samskivert/servlet/util/RequestUtils.java similarity index 100% rename from src/java/com/samskivert/servlet/util/RequestUtils.java rename to src/main/java/com/samskivert/servlet/util/RequestUtils.java diff --git a/src/java/com/samskivert/servlet/util/ServiceWaiter.java b/src/main/java/com/samskivert/servlet/util/ServiceWaiter.java similarity index 100% rename from src/java/com/samskivert/servlet/util/ServiceWaiter.java rename to src/main/java/com/samskivert/servlet/util/ServiceWaiter.java diff --git a/src/java/com/samskivert/servlet/util/package.html b/src/main/java/com/samskivert/servlet/util/package.html similarity index 100% rename from src/java/com/samskivert/servlet/util/package.html rename to src/main/java/com/samskivert/servlet/util/package.html diff --git a/src/java/com/samskivert/swing/AWTResultListener.java b/src/main/java/com/samskivert/swing/AWTResultListener.java similarity index 100% rename from src/java/com/samskivert/swing/AWTResultListener.java rename to src/main/java/com/samskivert/swing/AWTResultListener.java diff --git a/src/java/com/samskivert/swing/AbsoluteLayout.java b/src/main/java/com/samskivert/swing/AbsoluteLayout.java similarity index 100% rename from src/java/com/samskivert/swing/AbsoluteLayout.java rename to src/main/java/com/samskivert/swing/AbsoluteLayout.java diff --git a/src/java/com/samskivert/swing/CollapsibleList.java b/src/main/java/com/samskivert/swing/CollapsibleList.java similarity index 100% rename from src/java/com/samskivert/swing/CollapsibleList.java rename to src/main/java/com/samskivert/swing/CollapsibleList.java diff --git a/src/java/com/samskivert/swing/CollapsiblePanel.java b/src/main/java/com/samskivert/swing/CollapsiblePanel.java similarity index 100% rename from src/java/com/samskivert/swing/CollapsiblePanel.java rename to src/main/java/com/samskivert/swing/CollapsiblePanel.java diff --git a/src/java/com/samskivert/swing/ComboButtonBox.java b/src/main/java/com/samskivert/swing/ComboButtonBox.java similarity index 100% rename from src/java/com/samskivert/swing/ComboButtonBox.java rename to src/main/java/com/samskivert/swing/ComboButtonBox.java diff --git a/src/java/com/samskivert/swing/CommandButton.java b/src/main/java/com/samskivert/swing/CommandButton.java similarity index 100% rename from src/java/com/samskivert/swing/CommandButton.java rename to src/main/java/com/samskivert/swing/CommandButton.java diff --git a/src/java/com/samskivert/swing/ControlledPanel.java b/src/main/java/com/samskivert/swing/ControlledPanel.java similarity index 100% rename from src/java/com/samskivert/swing/ControlledPanel.java rename to src/main/java/com/samskivert/swing/ControlledPanel.java diff --git a/src/java/com/samskivert/swing/Controller.java b/src/main/java/com/samskivert/swing/Controller.java similarity index 100% rename from src/java/com/samskivert/swing/Controller.java rename to src/main/java/com/samskivert/swing/Controller.java diff --git a/src/java/com/samskivert/swing/ControllerProvider.java b/src/main/java/com/samskivert/swing/ControllerProvider.java similarity index 100% rename from src/java/com/samskivert/swing/ControllerProvider.java rename to src/main/java/com/samskivert/swing/ControllerProvider.java diff --git a/src/java/com/samskivert/swing/DimenInfo.java b/src/main/java/com/samskivert/swing/DimenInfo.java similarity index 100% rename from src/java/com/samskivert/swing/DimenInfo.java rename to src/main/java/com/samskivert/swing/DimenInfo.java diff --git a/src/java/com/samskivert/swing/DimmedIcon.java b/src/main/java/com/samskivert/swing/DimmedIcon.java similarity index 100% rename from src/java/com/samskivert/swing/DimmedIcon.java rename to src/main/java/com/samskivert/swing/DimmedIcon.java diff --git a/src/java/com/samskivert/swing/EnablingAdapter.java b/src/main/java/com/samskivert/swing/EnablingAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/EnablingAdapter.java rename to src/main/java/com/samskivert/swing/EnablingAdapter.java diff --git a/src/java/com/samskivert/swing/GroupLayout.java b/src/main/java/com/samskivert/swing/GroupLayout.java similarity index 100% rename from src/java/com/samskivert/swing/GroupLayout.java rename to src/main/java/com/samskivert/swing/GroupLayout.java diff --git a/src/java/com/samskivert/swing/GroupLayoutTest.java b/src/main/java/com/samskivert/swing/GroupLayoutTest.java similarity index 100% rename from src/java/com/samskivert/swing/GroupLayoutTest.java rename to src/main/java/com/samskivert/swing/GroupLayoutTest.java diff --git a/src/java/com/samskivert/swing/HGroupLayout.java b/src/main/java/com/samskivert/swing/HGroupLayout.java similarity index 100% rename from src/java/com/samskivert/swing/HGroupLayout.java rename to src/main/java/com/samskivert/swing/HGroupLayout.java diff --git a/src/java/com/samskivert/swing/IntField.java b/src/main/java/com/samskivert/swing/IntField.java similarity index 100% rename from src/java/com/samskivert/swing/IntField.java rename to src/main/java/com/samskivert/swing/IntField.java diff --git a/src/java/com/samskivert/swing/IntegerTableCellRenderer.java b/src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java similarity index 100% rename from src/java/com/samskivert/swing/IntegerTableCellRenderer.java rename to src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java diff --git a/src/java/com/samskivert/swing/JInternalDialog.java b/src/main/java/com/samskivert/swing/JInternalDialog.java similarity index 100% rename from src/java/com/samskivert/swing/JInternalDialog.java rename to src/main/java/com/samskivert/swing/JInternalDialog.java diff --git a/src/java/com/samskivert/swing/Label.java b/src/main/java/com/samskivert/swing/Label.java similarity index 100% rename from src/java/com/samskivert/swing/Label.java rename to src/main/java/com/samskivert/swing/Label.java diff --git a/src/java/com/samskivert/swing/LabelSausage.java b/src/main/java/com/samskivert/swing/LabelSausage.java similarity index 100% rename from src/java/com/samskivert/swing/LabelSausage.java rename to src/main/java/com/samskivert/swing/LabelSausage.java diff --git a/src/java/com/samskivert/swing/LabelStyleConstants.java b/src/main/java/com/samskivert/swing/LabelStyleConstants.java similarity index 100% rename from src/java/com/samskivert/swing/LabelStyleConstants.java rename to src/main/java/com/samskivert/swing/LabelStyleConstants.java diff --git a/src/java/com/samskivert/swing/LazyComponent.java b/src/main/java/com/samskivert/swing/LazyComponent.java similarity index 100% rename from src/java/com/samskivert/swing/LazyComponent.java rename to src/main/java/com/samskivert/swing/LazyComponent.java diff --git a/src/java/com/samskivert/swing/MultiLineLabel.java b/src/main/java/com/samskivert/swing/MultiLineLabel.java similarity index 100% rename from src/java/com/samskivert/swing/MultiLineLabel.java rename to src/main/java/com/samskivert/swing/MultiLineLabel.java diff --git a/src/java/com/samskivert/swing/ObjectEditorTable.java b/src/main/java/com/samskivert/swing/ObjectEditorTable.java similarity index 100% rename from src/java/com/samskivert/swing/ObjectEditorTable.java rename to src/main/java/com/samskivert/swing/ObjectEditorTable.java diff --git a/src/java/com/samskivert/swing/RadialLabelSausage.java b/src/main/java/com/samskivert/swing/RadialLabelSausage.java similarity index 100% rename from src/java/com/samskivert/swing/RadialLabelSausage.java rename to src/main/java/com/samskivert/swing/RadialLabelSausage.java diff --git a/src/java/com/samskivert/swing/RadialMenu.java b/src/main/java/com/samskivert/swing/RadialMenu.java similarity index 100% rename from src/java/com/samskivert/swing/RadialMenu.java rename to src/main/java/com/samskivert/swing/RadialMenu.java diff --git a/src/java/com/samskivert/swing/RadialMenuItem.java b/src/main/java/com/samskivert/swing/RadialMenuItem.java similarity index 100% rename from src/java/com/samskivert/swing/RadialMenuItem.java rename to src/main/java/com/samskivert/swing/RadialMenuItem.java diff --git a/src/java/com/samskivert/swing/RuntimeAdjust.java b/src/main/java/com/samskivert/swing/RuntimeAdjust.java similarity index 100% rename from src/java/com/samskivert/swing/RuntimeAdjust.java rename to src/main/java/com/samskivert/swing/RuntimeAdjust.java diff --git a/src/java/com/samskivert/swing/SafeLayeredPane.java b/src/main/java/com/samskivert/swing/SafeLayeredPane.java similarity index 100% rename from src/java/com/samskivert/swing/SafeLayeredPane.java rename to src/main/java/com/samskivert/swing/SafeLayeredPane.java diff --git a/src/java/com/samskivert/swing/ScaledIcon.java b/src/main/java/com/samskivert/swing/ScaledIcon.java similarity index 100% rename from src/java/com/samskivert/swing/ScaledIcon.java rename to src/main/java/com/samskivert/swing/ScaledIcon.java diff --git a/src/java/com/samskivert/swing/ScrollBox.java b/src/main/java/com/samskivert/swing/ScrollBox.java similarity index 100% rename from src/java/com/samskivert/swing/ScrollBox.java rename to src/main/java/com/samskivert/swing/ScrollBox.java diff --git a/src/java/com/samskivert/swing/ScrollablePanel.java b/src/main/java/com/samskivert/swing/ScrollablePanel.java similarity index 100% rename from src/java/com/samskivert/swing/ScrollablePanel.java rename to src/main/java/com/samskivert/swing/ScrollablePanel.java diff --git a/src/java/com/samskivert/swing/ShapeIcon.java b/src/main/java/com/samskivert/swing/ShapeIcon.java similarity index 100% rename from src/java/com/samskivert/swing/ShapeIcon.java rename to src/main/java/com/samskivert/swing/ShapeIcon.java diff --git a/src/java/com/samskivert/swing/SimpleSlider.java b/src/main/java/com/samskivert/swing/SimpleSlider.java similarity index 100% rename from src/java/com/samskivert/swing/SimpleSlider.java rename to src/main/java/com/samskivert/swing/SimpleSlider.java diff --git a/src/java/com/samskivert/swing/SmartPolygon.java b/src/main/java/com/samskivert/swing/SmartPolygon.java similarity index 100% rename from src/java/com/samskivert/swing/SmartPolygon.java rename to src/main/java/com/samskivert/swing/SmartPolygon.java diff --git a/src/java/com/samskivert/swing/Spacer.java b/src/main/java/com/samskivert/swing/Spacer.java similarity index 100% rename from src/java/com/samskivert/swing/Spacer.java rename to src/main/java/com/samskivert/swing/Spacer.java diff --git a/src/java/com/samskivert/swing/TGraphics2D.java b/src/main/java/com/samskivert/swing/TGraphics2D.java similarity index 100% rename from src/java/com/samskivert/swing/TGraphics2D.java rename to src/main/java/com/samskivert/swing/TGraphics2D.java diff --git a/src/java/com/samskivert/swing/TableMap.java b/src/main/java/com/samskivert/swing/TableMap.java similarity index 100% rename from src/java/com/samskivert/swing/TableMap.java rename to src/main/java/com/samskivert/swing/TableMap.java diff --git a/src/java/com/samskivert/swing/TableSorter.java b/src/main/java/com/samskivert/swing/TableSorter.java similarity index 100% rename from src/java/com/samskivert/swing/TableSorter.java rename to src/main/java/com/samskivert/swing/TableSorter.java diff --git a/src/java/com/samskivert/swing/Timer.java b/src/main/java/com/samskivert/swing/Timer.java similarity index 100% rename from src/java/com/samskivert/swing/Timer.java rename to src/main/java/com/samskivert/swing/Timer.java diff --git a/src/java/com/samskivert/swing/VGroupLayout.java b/src/main/java/com/samskivert/swing/VGroupLayout.java similarity index 100% rename from src/java/com/samskivert/swing/VGroupLayout.java rename to src/main/java/com/samskivert/swing/VGroupLayout.java diff --git a/src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java b/src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java similarity index 100% rename from src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java rename to src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java diff --git a/src/java/com/samskivert/swing/dnd/DnDManager.java b/src/main/java/com/samskivert/swing/dnd/DnDManager.java similarity index 100% rename from src/java/com/samskivert/swing/dnd/DnDManager.java rename to src/main/java/com/samskivert/swing/dnd/DnDManager.java diff --git a/src/java/com/samskivert/swing/dnd/DragSource.java b/src/main/java/com/samskivert/swing/dnd/DragSource.java similarity index 100% rename from src/java/com/samskivert/swing/dnd/DragSource.java rename to src/main/java/com/samskivert/swing/dnd/DragSource.java diff --git a/src/java/com/samskivert/swing/dnd/DropTarget.java b/src/main/java/com/samskivert/swing/dnd/DropTarget.java similarity index 100% rename from src/java/com/samskivert/swing/dnd/DropTarget.java rename to src/main/java/com/samskivert/swing/dnd/DropTarget.java diff --git a/src/java/com/samskivert/swing/dnd/package.html b/src/main/java/com/samskivert/swing/dnd/package.html similarity index 100% rename from src/java/com/samskivert/swing/dnd/package.html rename to src/main/java/com/samskivert/swing/dnd/package.html diff --git a/src/java/com/samskivert/swing/event/AncestorAdapter.java b/src/main/java/com/samskivert/swing/event/AncestorAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/event/AncestorAdapter.java rename to src/main/java/com/samskivert/swing/event/AncestorAdapter.java diff --git a/src/java/com/samskivert/swing/event/CommandEvent.java b/src/main/java/com/samskivert/swing/event/CommandEvent.java similarity index 100% rename from src/java/com/samskivert/swing/event/CommandEvent.java rename to src/main/java/com/samskivert/swing/event/CommandEvent.java diff --git a/src/java/com/samskivert/swing/event/DocumentAdapter.java b/src/main/java/com/samskivert/swing/event/DocumentAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/event/DocumentAdapter.java rename to src/main/java/com/samskivert/swing/event/DocumentAdapter.java diff --git a/src/java/com/samskivert/swing/event/MouseArmingAdapter.java b/src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/event/MouseArmingAdapter.java rename to src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java diff --git a/src/java/com/samskivert/swing/event/PopupMenuAdapter.java b/src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/event/PopupMenuAdapter.java rename to src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java diff --git a/src/java/com/samskivert/swing/event/package.html b/src/main/java/com/samskivert/swing/event/package.html similarity index 100% rename from src/java/com/samskivert/swing/event/package.html rename to src/main/java/com/samskivert/swing/event/package.html diff --git a/src/java/com/samskivert/swing/package.html b/src/main/java/com/samskivert/swing/package.html similarity index 100% rename from src/java/com/samskivert/swing/package.html rename to src/main/java/com/samskivert/swing/package.html diff --git a/src/java/com/samskivert/swing/util/ButtonUtil.java b/src/main/java/com/samskivert/swing/util/ButtonUtil.java similarity index 100% rename from src/java/com/samskivert/swing/util/ButtonUtil.java rename to src/main/java/com/samskivert/swing/util/ButtonUtil.java diff --git a/src/java/com/samskivert/swing/util/DialogUtil.java b/src/main/java/com/samskivert/swing/util/DialogUtil.java similarity index 100% rename from src/java/com/samskivert/swing/util/DialogUtil.java rename to src/main/java/com/samskivert/swing/util/DialogUtil.java diff --git a/src/java/com/samskivert/swing/util/MenuUtil.java b/src/main/java/com/samskivert/swing/util/MenuUtil.java similarity index 100% rename from src/java/com/samskivert/swing/util/MenuUtil.java rename to src/main/java/com/samskivert/swing/util/MenuUtil.java diff --git a/src/java/com/samskivert/swing/util/MouseHijacker.java b/src/main/java/com/samskivert/swing/util/MouseHijacker.java similarity index 100% rename from src/java/com/samskivert/swing/util/MouseHijacker.java rename to src/main/java/com/samskivert/swing/util/MouseHijacker.java diff --git a/src/java/com/samskivert/swing/util/ProximityTracker.java b/src/main/java/com/samskivert/swing/util/ProximityTracker.java similarity index 100% rename from src/java/com/samskivert/swing/util/ProximityTracker.java rename to src/main/java/com/samskivert/swing/util/ProximityTracker.java diff --git a/src/java/com/samskivert/swing/util/RetryableTask.java b/src/main/java/com/samskivert/swing/util/RetryableTask.java similarity index 100% rename from src/java/com/samskivert/swing/util/RetryableTask.java rename to src/main/java/com/samskivert/swing/util/RetryableTask.java diff --git a/src/java/com/samskivert/swing/util/SwingUtil.java b/src/main/java/com/samskivert/swing/util/SwingUtil.java similarity index 100% rename from src/java/com/samskivert/swing/util/SwingUtil.java rename to src/main/java/com/samskivert/swing/util/SwingUtil.java diff --git a/src/java/com/samskivert/swing/util/Task.java b/src/main/java/com/samskivert/swing/util/Task.java similarity index 100% rename from src/java/com/samskivert/swing/util/Task.java rename to src/main/java/com/samskivert/swing/util/Task.java diff --git a/src/java/com/samskivert/swing/util/TaskAdapter.java b/src/main/java/com/samskivert/swing/util/TaskAdapter.java similarity index 100% rename from src/java/com/samskivert/swing/util/TaskAdapter.java rename to src/main/java/com/samskivert/swing/util/TaskAdapter.java diff --git a/src/java/com/samskivert/swing/util/TaskMaster.java b/src/main/java/com/samskivert/swing/util/TaskMaster.java similarity index 100% rename from src/java/com/samskivert/swing/util/TaskMaster.java rename to src/main/java/com/samskivert/swing/util/TaskMaster.java diff --git a/src/java/com/samskivert/swing/util/TaskObserver.java b/src/main/java/com/samskivert/swing/util/TaskObserver.java similarity index 100% rename from src/java/com/samskivert/swing/util/TaskObserver.java rename to src/main/java/com/samskivert/swing/util/TaskObserver.java diff --git a/src/java/com/samskivert/swing/util/package.html b/src/main/java/com/samskivert/swing/util/package.html similarity index 100% rename from src/java/com/samskivert/swing/util/package.html rename to src/main/java/com/samskivert/swing/util/package.html diff --git a/src/java/com/samskivert/test/TestUtil.java b/src/main/java/com/samskivert/test/TestUtil.java similarity index 100% rename from src/java/com/samskivert/test/TestUtil.java rename to src/main/java/com/samskivert/test/TestUtil.java diff --git a/src/java/com/samskivert/test/package.html b/src/main/java/com/samskivert/test/package.html similarity index 100% rename from src/java/com/samskivert/test/package.html rename to src/main/java/com/samskivert/test/package.html diff --git a/src/java/com/samskivert/text/MessageUtil.java b/src/main/java/com/samskivert/text/MessageUtil.java similarity index 100% rename from src/java/com/samskivert/text/MessageUtil.java rename to src/main/java/com/samskivert/text/MessageUtil.java diff --git a/src/java/com/samskivert/text/package.html b/src/main/java/com/samskivert/text/package.html similarity index 100% rename from src/java/com/samskivert/text/package.html rename to src/main/java/com/samskivert/text/package.html diff --git a/src/java/com/samskivert/util/AbstractIntSet.java b/src/main/java/com/samskivert/util/AbstractIntSet.java similarity index 100% rename from src/java/com/samskivert/util/AbstractIntSet.java rename to src/main/java/com/samskivert/util/AbstractIntSet.java diff --git a/src/java/com/samskivert/util/AbstractInterator.java b/src/main/java/com/samskivert/util/AbstractInterator.java similarity index 100% rename from src/java/com/samskivert/util/AbstractInterator.java rename to src/main/java/com/samskivert/util/AbstractInterator.java diff --git a/src/java/com/samskivert/util/ArrayIntSet.java b/src/main/java/com/samskivert/util/ArrayIntSet.java similarity index 100% rename from src/java/com/samskivert/util/ArrayIntSet.java rename to src/main/java/com/samskivert/util/ArrayIntSet.java diff --git a/src/java/com/samskivert/util/ArrayUtil.java b/src/main/java/com/samskivert/util/ArrayUtil.java similarity index 100% rename from src/java/com/samskivert/util/ArrayUtil.java rename to src/main/java/com/samskivert/util/ArrayUtil.java diff --git a/src/java/com/samskivert/util/AuditLogger.java b/src/main/java/com/samskivert/util/AuditLogger.java similarity index 100% rename from src/java/com/samskivert/util/AuditLogger.java rename to src/main/java/com/samskivert/util/AuditLogger.java diff --git a/src/java/com/samskivert/util/BaseArrayList.java b/src/main/java/com/samskivert/util/BaseArrayList.java similarity index 100% rename from src/java/com/samskivert/util/BaseArrayList.java rename to src/main/java/com/samskivert/util/BaseArrayList.java diff --git a/src/java/com/samskivert/util/BasicRunQueue.java b/src/main/java/com/samskivert/util/BasicRunQueue.java similarity index 100% rename from src/java/com/samskivert/util/BasicRunQueue.java rename to src/main/java/com/samskivert/util/BasicRunQueue.java diff --git a/src/java/com/samskivert/util/ByteEnum.java b/src/main/java/com/samskivert/util/ByteEnum.java similarity index 100% rename from src/java/com/samskivert/util/ByteEnum.java rename to src/main/java/com/samskivert/util/ByteEnum.java diff --git a/src/java/com/samskivert/util/ByteEnumUtil.java b/src/main/java/com/samskivert/util/ByteEnumUtil.java similarity index 100% rename from src/java/com/samskivert/util/ByteEnumUtil.java rename to src/main/java/com/samskivert/util/ByteEnumUtil.java diff --git a/src/java/com/samskivert/util/CalendarUtil.java b/src/main/java/com/samskivert/util/CalendarUtil.java similarity index 100% rename from src/java/com/samskivert/util/CalendarUtil.java rename to src/main/java/com/samskivert/util/CalendarUtil.java diff --git a/src/java/com/samskivert/util/Calendars.java b/src/main/java/com/samskivert/util/Calendars.java similarity index 100% rename from src/java/com/samskivert/util/Calendars.java rename to src/main/java/com/samskivert/util/Calendars.java diff --git a/src/java/com/samskivert/util/Callables.java b/src/main/java/com/samskivert/util/Callables.java similarity index 100% rename from src/java/com/samskivert/util/Callables.java rename to src/main/java/com/samskivert/util/Callables.java diff --git a/src/java/com/samskivert/util/ChainedResultListener.java b/src/main/java/com/samskivert/util/ChainedResultListener.java similarity index 100% rename from src/java/com/samskivert/util/ChainedResultListener.java rename to src/main/java/com/samskivert/util/ChainedResultListener.java diff --git a/src/java/com/samskivert/util/CheapIntMap.java b/src/main/java/com/samskivert/util/CheapIntMap.java similarity index 100% rename from src/java/com/samskivert/util/CheapIntMap.java rename to src/main/java/com/samskivert/util/CheapIntMap.java diff --git a/src/java/com/samskivert/util/ClassUtil.java b/src/main/java/com/samskivert/util/ClassUtil.java similarity index 100% rename from src/java/com/samskivert/util/ClassUtil.java rename to src/main/java/com/samskivert/util/ClassUtil.java diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/main/java/com/samskivert/util/CollectionUtil.java similarity index 100% rename from src/java/com/samskivert/util/CollectionUtil.java rename to src/main/java/com/samskivert/util/CollectionUtil.java diff --git a/src/java/com/samskivert/util/Collections.java b/src/main/java/com/samskivert/util/Collections.java similarity index 100% rename from src/java/com/samskivert/util/Collections.java rename to src/main/java/com/samskivert/util/Collections.java diff --git a/src/java/com/samskivert/util/CompactIntListUtil.java b/src/main/java/com/samskivert/util/CompactIntListUtil.java similarity index 100% rename from src/java/com/samskivert/util/CompactIntListUtil.java rename to src/main/java/com/samskivert/util/CompactIntListUtil.java diff --git a/src/java/com/samskivert/util/ComparableArrayList.java b/src/main/java/com/samskivert/util/ComparableArrayList.java similarity index 100% rename from src/java/com/samskivert/util/ComparableArrayList.java rename to src/main/java/com/samskivert/util/ComparableArrayList.java diff --git a/src/java/com/samskivert/util/ComparableTuple.java b/src/main/java/com/samskivert/util/ComparableTuple.java similarity index 100% rename from src/java/com/samskivert/util/ComparableTuple.java rename to src/main/java/com/samskivert/util/ComparableTuple.java diff --git a/src/java/com/samskivert/util/Comparators.java b/src/main/java/com/samskivert/util/Comparators.java similarity index 100% rename from src/java/com/samskivert/util/Comparators.java rename to src/main/java/com/samskivert/util/Comparators.java diff --git a/src/java/com/samskivert/util/ComplainingListener.java b/src/main/java/com/samskivert/util/ComplainingListener.java similarity index 100% rename from src/java/com/samskivert/util/ComplainingListener.java rename to src/main/java/com/samskivert/util/ComplainingListener.java diff --git a/src/java/com/samskivert/util/Config.java b/src/main/java/com/samskivert/util/Config.java similarity index 100% rename from src/java/com/samskivert/util/Config.java rename to src/main/java/com/samskivert/util/Config.java diff --git a/src/java/com/samskivert/util/ConfigUtil.java b/src/main/java/com/samskivert/util/ConfigUtil.java similarity index 100% rename from src/java/com/samskivert/util/ConfigUtil.java rename to src/main/java/com/samskivert/util/ConfigUtil.java diff --git a/src/java/com/samskivert/util/CountHashMap.java b/src/main/java/com/samskivert/util/CountHashMap.java similarity index 100% rename from src/java/com/samskivert/util/CountHashMap.java rename to src/main/java/com/samskivert/util/CountHashMap.java diff --git a/src/java/com/samskivert/util/CountMap.java b/src/main/java/com/samskivert/util/CountMap.java similarity index 100% rename from src/java/com/samskivert/util/CountMap.java rename to src/main/java/com/samskivert/util/CountMap.java diff --git a/src/java/com/samskivert/util/Crypt.java b/src/main/java/com/samskivert/util/Crypt.java similarity index 100% rename from src/java/com/samskivert/util/Crypt.java rename to src/main/java/com/samskivert/util/Crypt.java diff --git a/src/java/com/samskivert/util/CurrencyUtil.java b/src/main/java/com/samskivert/util/CurrencyUtil.java similarity index 100% rename from src/java/com/samskivert/util/CurrencyUtil.java rename to src/main/java/com/samskivert/util/CurrencyUtil.java diff --git a/src/java/com/samskivert/util/DebugChords.java b/src/main/java/com/samskivert/util/DebugChords.java similarity index 100% rename from src/java/com/samskivert/util/DebugChords.java rename to src/main/java/com/samskivert/util/DebugChords.java diff --git a/src/java/com/samskivert/util/DefaultLogProvider.java b/src/main/java/com/samskivert/util/DefaultLogProvider.java similarity index 100% rename from src/java/com/samskivert/util/DefaultLogProvider.java rename to src/main/java/com/samskivert/util/DefaultLogProvider.java diff --git a/src/java/com/samskivert/util/DependencyGraph.java b/src/main/java/com/samskivert/util/DependencyGraph.java similarity index 100% rename from src/java/com/samskivert/util/DependencyGraph.java rename to src/main/java/com/samskivert/util/DependencyGraph.java diff --git a/src/java/com/samskivert/util/ExpiringReference.java b/src/main/java/com/samskivert/util/ExpiringReference.java similarity index 100% rename from src/java/com/samskivert/util/ExpiringReference.java rename to src/main/java/com/samskivert/util/ExpiringReference.java diff --git a/src/java/com/samskivert/util/FailureListener.java b/src/main/java/com/samskivert/util/FailureListener.java similarity index 100% rename from src/java/com/samskivert/util/FailureListener.java rename to src/main/java/com/samskivert/util/FailureListener.java diff --git a/src/java/com/samskivert/util/FileUtil.java b/src/main/java/com/samskivert/util/FileUtil.java similarity index 100% rename from src/java/com/samskivert/util/FileUtil.java rename to src/main/java/com/samskivert/util/FileUtil.java diff --git a/src/java/com/samskivert/util/FormatterUtil.java b/src/main/java/com/samskivert/util/FormatterUtil.java similarity index 100% rename from src/java/com/samskivert/util/FormatterUtil.java rename to src/main/java/com/samskivert/util/FormatterUtil.java diff --git a/src/java/com/samskivert/util/GenUtil.java b/src/main/java/com/samskivert/util/GenUtil.java similarity index 100% rename from src/java/com/samskivert/util/GenUtil.java rename to src/main/java/com/samskivert/util/GenUtil.java diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/main/java/com/samskivert/util/HashIntMap.java similarity index 100% rename from src/java/com/samskivert/util/HashIntMap.java rename to src/main/java/com/samskivert/util/HashIntMap.java diff --git a/src/java/com/samskivert/util/HashIntSet.java b/src/main/java/com/samskivert/util/HashIntSet.java similarity index 100% rename from src/java/com/samskivert/util/HashIntSet.java rename to src/main/java/com/samskivert/util/HashIntSet.java diff --git a/src/java/com/samskivert/util/Histogram.java b/src/main/java/com/samskivert/util/Histogram.java similarity index 100% rename from src/java/com/samskivert/util/Histogram.java rename to src/main/java/com/samskivert/util/Histogram.java diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/main/java/com/samskivert/util/IntIntMap.java similarity index 100% rename from src/java/com/samskivert/util/IntIntMap.java rename to src/main/java/com/samskivert/util/IntIntMap.java diff --git a/src/java/com/samskivert/util/IntListUtil.java b/src/main/java/com/samskivert/util/IntListUtil.java similarity index 100% rename from src/java/com/samskivert/util/IntListUtil.java rename to src/main/java/com/samskivert/util/IntListUtil.java diff --git a/src/java/com/samskivert/util/IntMap.java b/src/main/java/com/samskivert/util/IntMap.java similarity index 100% rename from src/java/com/samskivert/util/IntMap.java rename to src/main/java/com/samskivert/util/IntMap.java diff --git a/src/java/com/samskivert/util/IntMaps.java b/src/main/java/com/samskivert/util/IntMaps.java similarity index 100% rename from src/java/com/samskivert/util/IntMaps.java rename to src/main/java/com/samskivert/util/IntMaps.java diff --git a/src/java/com/samskivert/util/IntResultListener.java b/src/main/java/com/samskivert/util/IntResultListener.java similarity index 100% rename from src/java/com/samskivert/util/IntResultListener.java rename to src/main/java/com/samskivert/util/IntResultListener.java diff --git a/src/java/com/samskivert/util/IntSet.java b/src/main/java/com/samskivert/util/IntSet.java similarity index 100% rename from src/java/com/samskivert/util/IntSet.java rename to src/main/java/com/samskivert/util/IntSet.java diff --git a/src/java/com/samskivert/util/IntSets.java b/src/main/java/com/samskivert/util/IntSets.java similarity index 100% rename from src/java/com/samskivert/util/IntSets.java rename to src/main/java/com/samskivert/util/IntSets.java diff --git a/src/java/com/samskivert/util/IntTuple.java b/src/main/java/com/samskivert/util/IntTuple.java similarity index 100% rename from src/java/com/samskivert/util/IntTuple.java rename to src/main/java/com/samskivert/util/IntTuple.java diff --git a/src/java/com/samskivert/util/Interable.java b/src/main/java/com/samskivert/util/Interable.java similarity index 100% rename from src/java/com/samskivert/util/Interable.java rename to src/main/java/com/samskivert/util/Interable.java diff --git a/src/java/com/samskivert/util/Interator.java b/src/main/java/com/samskivert/util/Interator.java similarity index 100% rename from src/java/com/samskivert/util/Interator.java rename to src/main/java/com/samskivert/util/Interator.java diff --git a/src/java/com/samskivert/util/Interval.java b/src/main/java/com/samskivert/util/Interval.java similarity index 100% rename from src/java/com/samskivert/util/Interval.java rename to src/main/java/com/samskivert/util/Interval.java diff --git a/src/java/com/samskivert/util/Invoker.java b/src/main/java/com/samskivert/util/Invoker.java similarity index 100% rename from src/java/com/samskivert/util/Invoker.java rename to src/main/java/com/samskivert/util/Invoker.java diff --git a/src/java/com/samskivert/util/JDK14Logger.java b/src/main/java/com/samskivert/util/JDK14Logger.java similarity index 100% rename from src/java/com/samskivert/util/JDK14Logger.java rename to src/main/java/com/samskivert/util/JDK14Logger.java diff --git a/src/java/com/samskivert/util/KeyUtil.java b/src/main/java/com/samskivert/util/KeyUtil.java similarity index 100% rename from src/java/com/samskivert/util/KeyUtil.java rename to src/main/java/com/samskivert/util/KeyUtil.java diff --git a/src/java/com/samskivert/util/KeyValue.java b/src/main/java/com/samskivert/util/KeyValue.java similarity index 100% rename from src/java/com/samskivert/util/KeyValue.java rename to src/main/java/com/samskivert/util/KeyValue.java diff --git a/src/java/com/samskivert/util/LRUHashMap.java b/src/main/java/com/samskivert/util/LRUHashMap.java similarity index 100% rename from src/java/com/samskivert/util/LRUHashMap.java rename to src/main/java/com/samskivert/util/LRUHashMap.java diff --git a/src/java/com/samskivert/util/Lifecycle.java b/src/main/java/com/samskivert/util/Lifecycle.java similarity index 100% rename from src/java/com/samskivert/util/Lifecycle.java rename to src/main/java/com/samskivert/util/Lifecycle.java diff --git a/src/java/com/samskivert/util/ListUtil.java b/src/main/java/com/samskivert/util/ListUtil.java similarity index 100% rename from src/java/com/samskivert/util/ListUtil.java rename to src/main/java/com/samskivert/util/ListUtil.java diff --git a/src/java/com/samskivert/util/Log.java b/src/main/java/com/samskivert/util/Log.java similarity index 100% rename from src/java/com/samskivert/util/Log.java rename to src/main/java/com/samskivert/util/Log.java diff --git a/src/java/com/samskivert/util/Log4JLogger.java b/src/main/java/com/samskivert/util/Log4JLogger.java similarity index 100% rename from src/java/com/samskivert/util/Log4JLogger.java rename to src/main/java/com/samskivert/util/Log4JLogger.java diff --git a/src/java/com/samskivert/util/LogBuilder.java b/src/main/java/com/samskivert/util/LogBuilder.java similarity index 100% rename from src/java/com/samskivert/util/LogBuilder.java rename to src/main/java/com/samskivert/util/LogBuilder.java diff --git a/src/java/com/samskivert/util/LogProvider.java b/src/main/java/com/samskivert/util/LogProvider.java similarity index 100% rename from src/java/com/samskivert/util/LogProvider.java rename to src/main/java/com/samskivert/util/LogProvider.java diff --git a/src/java/com/samskivert/util/Logger.java b/src/main/java/com/samskivert/util/Logger.java similarity index 100% rename from src/java/com/samskivert/util/Logger.java rename to src/main/java/com/samskivert/util/Logger.java diff --git a/src/java/com/samskivert/util/LoggingLogProvider.java b/src/main/java/com/samskivert/util/LoggingLogProvider.java similarity index 100% rename from src/java/com/samskivert/util/LoggingLogProvider.java rename to src/main/java/com/samskivert/util/LoggingLogProvider.java diff --git a/src/java/com/samskivert/util/LoopingThread.java b/src/main/java/com/samskivert/util/LoopingThread.java similarity index 100% rename from src/java/com/samskivert/util/LoopingThread.java rename to src/main/java/com/samskivert/util/LoopingThread.java diff --git a/src/java/com/samskivert/util/MapEntry.java b/src/main/java/com/samskivert/util/MapEntry.java similarity index 100% rename from src/java/com/samskivert/util/MapEntry.java rename to src/main/java/com/samskivert/util/MapEntry.java diff --git a/src/java/com/samskivert/util/Mapping.java b/src/main/java/com/samskivert/util/Mapping.java similarity index 100% rename from src/java/com/samskivert/util/Mapping.java rename to src/main/java/com/samskivert/util/Mapping.java diff --git a/src/java/com/samskivert/util/MethodFinder.java b/src/main/java/com/samskivert/util/MethodFinder.java similarity index 100% rename from src/java/com/samskivert/util/MethodFinder.java rename to src/main/java/com/samskivert/util/MethodFinder.java diff --git a/src/java/com/samskivert/util/Multex.java b/src/main/java/com/samskivert/util/Multex.java similarity index 100% rename from src/java/com/samskivert/util/Multex.java rename to src/main/java/com/samskivert/util/Multex.java diff --git a/src/java/com/samskivert/util/ObjectUtil.java b/src/main/java/com/samskivert/util/ObjectUtil.java similarity index 100% rename from src/java/com/samskivert/util/ObjectUtil.java rename to src/main/java/com/samskivert/util/ObjectUtil.java diff --git a/src/java/com/samskivert/util/ObserverList.java b/src/main/java/com/samskivert/util/ObserverList.java similarity index 100% rename from src/java/com/samskivert/util/ObserverList.java rename to src/main/java/com/samskivert/util/ObserverList.java diff --git a/src/java/com/samskivert/util/OneLineLogFormatter.java b/src/main/java/com/samskivert/util/OneLineLogFormatter.java similarity index 100% rename from src/java/com/samskivert/util/OneLineLogFormatter.java rename to src/main/java/com/samskivert/util/OneLineLogFormatter.java diff --git a/src/java/com/samskivert/util/Predicate.java b/src/main/java/com/samskivert/util/Predicate.java similarity index 100% rename from src/java/com/samskivert/util/Predicate.java rename to src/main/java/com/samskivert/util/Predicate.java diff --git a/src/java/com/samskivert/util/PrefsConfig.java b/src/main/java/com/samskivert/util/PrefsConfig.java similarity index 100% rename from src/java/com/samskivert/util/PrefsConfig.java rename to src/main/java/com/samskivert/util/PrefsConfig.java diff --git a/src/java/com/samskivert/util/ProcessLogger.java b/src/main/java/com/samskivert/util/ProcessLogger.java similarity index 100% rename from src/java/com/samskivert/util/ProcessLogger.java rename to src/main/java/com/samskivert/util/ProcessLogger.java diff --git a/src/java/com/samskivert/util/PropertiesUtil.java b/src/main/java/com/samskivert/util/PropertiesUtil.java similarity index 100% rename from src/java/com/samskivert/util/PropertiesUtil.java rename to src/main/java/com/samskivert/util/PropertiesUtil.java diff --git a/src/java/com/samskivert/util/Queue.java b/src/main/java/com/samskivert/util/Queue.java similarity index 100% rename from src/java/com/samskivert/util/Queue.java rename to src/main/java/com/samskivert/util/Queue.java diff --git a/src/java/com/samskivert/util/QuickSort.java b/src/main/java/com/samskivert/util/QuickSort.java similarity index 100% rename from src/java/com/samskivert/util/QuickSort.java rename to src/main/java/com/samskivert/util/QuickSort.java diff --git a/src/java/com/samskivert/util/RandomUtil.java b/src/main/java/com/samskivert/util/RandomUtil.java similarity index 100% rename from src/java/com/samskivert/util/RandomUtil.java rename to src/main/java/com/samskivert/util/RandomUtil.java diff --git a/src/java/com/samskivert/util/RecentList.java b/src/main/java/com/samskivert/util/RecentList.java similarity index 100% rename from src/java/com/samskivert/util/RecentList.java rename to src/main/java/com/samskivert/util/RecentList.java diff --git a/src/java/com/samskivert/util/RepeatCallTracker.java b/src/main/java/com/samskivert/util/RepeatCallTracker.java similarity index 100% rename from src/java/com/samskivert/util/RepeatCallTracker.java rename to src/main/java/com/samskivert/util/RepeatCallTracker.java diff --git a/src/java/com/samskivert/util/RepeatRecordFilter.java b/src/main/java/com/samskivert/util/RepeatRecordFilter.java similarity index 100% rename from src/java/com/samskivert/util/RepeatRecordFilter.java rename to src/main/java/com/samskivert/util/RepeatRecordFilter.java diff --git a/src/java/com/samskivert/util/ResultHandler.java b/src/main/java/com/samskivert/util/ResultHandler.java similarity index 100% rename from src/java/com/samskivert/util/ResultHandler.java rename to src/main/java/com/samskivert/util/ResultHandler.java diff --git a/src/java/com/samskivert/util/ResultListener.java b/src/main/java/com/samskivert/util/ResultListener.java similarity index 100% rename from src/java/com/samskivert/util/ResultListener.java rename to src/main/java/com/samskivert/util/ResultListener.java diff --git a/src/java/com/samskivert/util/ResultListenerList.java b/src/main/java/com/samskivert/util/ResultListenerList.java similarity index 100% rename from src/java/com/samskivert/util/ResultListenerList.java rename to src/main/java/com/samskivert/util/ResultListenerList.java diff --git a/src/java/com/samskivert/util/RunAnywhere.java b/src/main/java/com/samskivert/util/RunAnywhere.java similarity index 100% rename from src/java/com/samskivert/util/RunAnywhere.java rename to src/main/java/com/samskivert/util/RunAnywhere.java diff --git a/src/java/com/samskivert/util/RunQueue.java b/src/main/java/com/samskivert/util/RunQueue.java similarity index 100% rename from src/java/com/samskivert/util/RunQueue.java rename to src/main/java/com/samskivert/util/RunQueue.java diff --git a/src/java/com/samskivert/util/Runnables.java b/src/main/java/com/samskivert/util/Runnables.java similarity index 100% rename from src/java/com/samskivert/util/Runnables.java rename to src/main/java/com/samskivert/util/Runnables.java diff --git a/src/java/com/samskivert/util/SerialExecutor.java b/src/main/java/com/samskivert/util/SerialExecutor.java similarity index 100% rename from src/java/com/samskivert/util/SerialExecutor.java rename to src/main/java/com/samskivert/util/SerialExecutor.java diff --git a/src/java/com/samskivert/util/ServiceUnavailableException.java b/src/main/java/com/samskivert/util/ServiceUnavailableException.java similarity index 100% rename from src/java/com/samskivert/util/ServiceUnavailableException.java rename to src/main/java/com/samskivert/util/ServiceUnavailableException.java diff --git a/src/java/com/samskivert/util/ServiceWaiter.java b/src/main/java/com/samskivert/util/ServiceWaiter.java similarity index 100% rename from src/java/com/samskivert/util/ServiceWaiter.java rename to src/main/java/com/samskivert/util/ServiceWaiter.java diff --git a/src/java/com/samskivert/util/ShortestPath.java b/src/main/java/com/samskivert/util/ShortestPath.java similarity index 100% rename from src/java/com/samskivert/util/ShortestPath.java rename to src/main/java/com/samskivert/util/ShortestPath.java diff --git a/src/java/com/samskivert/util/SignalUtil.java b/src/main/java/com/samskivert/util/SignalUtil.java similarity index 100% rename from src/java/com/samskivert/util/SignalUtil.java rename to src/main/java/com/samskivert/util/SignalUtil.java diff --git a/src/java/com/samskivert/util/SoftCache.java b/src/main/java/com/samskivert/util/SoftCache.java similarity index 100% rename from src/java/com/samskivert/util/SoftCache.java rename to src/main/java/com/samskivert/util/SoftCache.java diff --git a/src/java/com/samskivert/util/SortableArrayList.java b/src/main/java/com/samskivert/util/SortableArrayList.java similarity index 100% rename from src/java/com/samskivert/util/SortableArrayList.java rename to src/main/java/com/samskivert/util/SortableArrayList.java diff --git a/src/java/com/samskivert/util/StringUtil.java b/src/main/java/com/samskivert/util/StringUtil.java similarity index 100% rename from src/java/com/samskivert/util/StringUtil.java rename to src/main/java/com/samskivert/util/StringUtil.java diff --git a/src/java/com/samskivert/util/SystemInfo.java b/src/main/java/com/samskivert/util/SystemInfo.java similarity index 100% rename from src/java/com/samskivert/util/SystemInfo.java rename to src/main/java/com/samskivert/util/SystemInfo.java diff --git a/src/java/com/samskivert/util/TermUtil.java b/src/main/java/com/samskivert/util/TermUtil.java similarity index 100% rename from src/java/com/samskivert/util/TermUtil.java rename to src/main/java/com/samskivert/util/TermUtil.java diff --git a/src/java/com/samskivert/util/TerseLogFormatter.java b/src/main/java/com/samskivert/util/TerseLogFormatter.java similarity index 100% rename from src/java/com/samskivert/util/TerseLogFormatter.java rename to src/main/java/com/samskivert/util/TerseLogFormatter.java diff --git a/src/java/com/samskivert/util/Throttle.java b/src/main/java/com/samskivert/util/Throttle.java similarity index 100% rename from src/java/com/samskivert/util/Throttle.java rename to src/main/java/com/samskivert/util/Throttle.java diff --git a/src/java/com/samskivert/util/Triple.java b/src/main/java/com/samskivert/util/Triple.java similarity index 100% rename from src/java/com/samskivert/util/Triple.java rename to src/main/java/com/samskivert/util/Triple.java diff --git a/src/java/com/samskivert/util/Tuple.java b/src/main/java/com/samskivert/util/Tuple.java similarity index 100% rename from src/java/com/samskivert/util/Tuple.java rename to src/main/java/com/samskivert/util/Tuple.java diff --git a/src/java/com/samskivert/util/ValueMarshaller.java b/src/main/java/com/samskivert/util/ValueMarshaller.java similarity index 100% rename from src/java/com/samskivert/util/ValueMarshaller.java rename to src/main/java/com/samskivert/util/ValueMarshaller.java diff --git a/src/java/com/samskivert/util/WeakObserverList.java b/src/main/java/com/samskivert/util/WeakObserverList.java similarity index 100% rename from src/java/com/samskivert/util/WeakObserverList.java rename to src/main/java/com/samskivert/util/WeakObserverList.java diff --git a/src/java/com/samskivert/util/package.html b/src/main/java/com/samskivert/util/package.html similarity index 100% rename from src/java/com/samskivert/util/package.html rename to src/main/java/com/samskivert/util/package.html diff --git a/src/java/com/samskivert/velocity/Application.java b/src/main/java/com/samskivert/velocity/Application.java similarity index 100% rename from src/java/com/samskivert/velocity/Application.java rename to src/main/java/com/samskivert/velocity/Application.java diff --git a/src/java/com/samskivert/velocity/ClasspathResourceLoader.java b/src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java similarity index 100% rename from src/java/com/samskivert/velocity/ClasspathResourceLoader.java rename to src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java diff --git a/src/java/com/samskivert/velocity/CurrencyTool.java b/src/main/java/com/samskivert/velocity/CurrencyTool.java similarity index 100% rename from src/java/com/samskivert/velocity/CurrencyTool.java rename to src/main/java/com/samskivert/velocity/CurrencyTool.java diff --git a/src/java/com/samskivert/velocity/DataTool.java b/src/main/java/com/samskivert/velocity/DataTool.java similarity index 100% rename from src/java/com/samskivert/velocity/DataTool.java rename to src/main/java/com/samskivert/velocity/DataTool.java diff --git a/src/java/com/samskivert/velocity/DispatcherServlet.java b/src/main/java/com/samskivert/velocity/DispatcherServlet.java similarity index 100% rename from src/java/com/samskivert/velocity/DispatcherServlet.java rename to src/main/java/com/samskivert/velocity/DispatcherServlet.java diff --git a/src/java/com/samskivert/velocity/DummyLogic.java b/src/main/java/com/samskivert/velocity/DummyLogic.java similarity index 100% rename from src/java/com/samskivert/velocity/DummyLogic.java rename to src/main/java/com/samskivert/velocity/DummyLogic.java diff --git a/src/java/com/samskivert/velocity/FormTool.java b/src/main/java/com/samskivert/velocity/FormTool.java similarity index 100% rename from src/java/com/samskivert/velocity/FormTool.java rename to src/main/java/com/samskivert/velocity/FormTool.java diff --git a/src/java/com/samskivert/velocity/I18nTool.java b/src/main/java/com/samskivert/velocity/I18nTool.java similarity index 100% rename from src/java/com/samskivert/velocity/I18nTool.java rename to src/main/java/com/samskivert/velocity/I18nTool.java diff --git a/src/java/com/samskivert/velocity/ImportDirective.java b/src/main/java/com/samskivert/velocity/ImportDirective.java similarity index 100% rename from src/java/com/samskivert/velocity/ImportDirective.java rename to src/main/java/com/samskivert/velocity/ImportDirective.java diff --git a/src/java/com/samskivert/velocity/InvocationContext.java b/src/main/java/com/samskivert/velocity/InvocationContext.java similarity index 100% rename from src/java/com/samskivert/velocity/InvocationContext.java rename to src/main/java/com/samskivert/velocity/InvocationContext.java diff --git a/src/java/com/samskivert/velocity/Logic.java b/src/main/java/com/samskivert/velocity/Logic.java similarity index 100% rename from src/java/com/samskivert/velocity/Logic.java rename to src/main/java/com/samskivert/velocity/Logic.java diff --git a/src/java/com/samskivert/velocity/ServletContextLogger.java b/src/main/java/com/samskivert/velocity/ServletContextLogger.java similarity index 100% rename from src/java/com/samskivert/velocity/ServletContextLogger.java rename to src/main/java/com/samskivert/velocity/ServletContextLogger.java diff --git a/src/java/com/samskivert/velocity/ServletContextResourceLoader.java b/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java similarity index 100% rename from src/java/com/samskivert/velocity/ServletContextResourceLoader.java rename to src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java diff --git a/src/java/com/samskivert/velocity/ServletContextResourceManager.java b/src/main/java/com/samskivert/velocity/ServletContextResourceManager.java similarity index 100% rename from src/java/com/samskivert/velocity/ServletContextResourceManager.java rename to src/main/java/com/samskivert/velocity/ServletContextResourceManager.java diff --git a/src/java/com/samskivert/velocity/SiteJarResourceLoader.java b/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java similarity index 100% rename from src/java/com/samskivert/velocity/SiteJarResourceLoader.java rename to src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java diff --git a/src/java/com/samskivert/velocity/SiteKey.java b/src/main/java/com/samskivert/velocity/SiteKey.java similarity index 100% rename from src/java/com/samskivert/velocity/SiteKey.java rename to src/main/java/com/samskivert/velocity/SiteKey.java diff --git a/src/java/com/samskivert/velocity/SiteResourceManager.java b/src/main/java/com/samskivert/velocity/SiteResourceManager.java similarity index 100% rename from src/java/com/samskivert/velocity/SiteResourceManager.java rename to src/main/java/com/samskivert/velocity/SiteResourceManager.java diff --git a/src/java/com/samskivert/velocity/StringTool.java b/src/main/java/com/samskivert/velocity/StringTool.java similarity index 100% rename from src/java/com/samskivert/velocity/StringTool.java rename to src/main/java/com/samskivert/velocity/StringTool.java diff --git a/src/java/com/samskivert/velocity/VelocityTestCase.java b/src/main/java/com/samskivert/velocity/VelocityTestCase.java similarity index 100% rename from src/java/com/samskivert/velocity/VelocityTestCase.java rename to src/main/java/com/samskivert/velocity/VelocityTestCase.java diff --git a/src/java/com/samskivert/velocity/VelocityUtil.java b/src/main/java/com/samskivert/velocity/VelocityUtil.java similarity index 100% rename from src/java/com/samskivert/velocity/VelocityUtil.java rename to src/main/java/com/samskivert/velocity/VelocityUtil.java diff --git a/src/java/com/samskivert/velocity/package.html b/src/main/java/com/samskivert/velocity/package.html similarity index 100% rename from src/java/com/samskivert/velocity/package.html rename to src/main/java/com/samskivert/velocity/package.html diff --git a/src/java/com/samskivert/velocity/tests/test.tmpl b/src/main/java/com/samskivert/velocity/tests/test.tmpl similarity index 100% rename from src/java/com/samskivert/velocity/tests/test.tmpl rename to src/main/java/com/samskivert/velocity/tests/test.tmpl diff --git a/src/java/com/samskivert/xml/CallMethodSpecialRule.java b/src/main/java/com/samskivert/xml/CallMethodSpecialRule.java similarity index 100% rename from src/java/com/samskivert/xml/CallMethodSpecialRule.java rename to src/main/java/com/samskivert/xml/CallMethodSpecialRule.java diff --git a/src/java/com/samskivert/xml/CheckVersionRule.java b/src/main/java/com/samskivert/xml/CheckVersionRule.java similarity index 100% rename from src/java/com/samskivert/xml/CheckVersionRule.java rename to src/main/java/com/samskivert/xml/CheckVersionRule.java diff --git a/src/java/com/samskivert/xml/SetFieldRule.java b/src/main/java/com/samskivert/xml/SetFieldRule.java similarity index 100% rename from src/java/com/samskivert/xml/SetFieldRule.java rename to src/main/java/com/samskivert/xml/SetFieldRule.java diff --git a/src/java/com/samskivert/xml/SetNextFieldRule.java b/src/main/java/com/samskivert/xml/SetNextFieldRule.java similarity index 100% rename from src/java/com/samskivert/xml/SetNextFieldRule.java rename to src/main/java/com/samskivert/xml/SetNextFieldRule.java diff --git a/src/java/com/samskivert/xml/SetPropertyFieldsRule.java b/src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java similarity index 100% rename from src/java/com/samskivert/xml/SetPropertyFieldsRule.java rename to src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java diff --git a/src/java/com/samskivert/xml/SimpleParser.java b/src/main/java/com/samskivert/xml/SimpleParser.java similarity index 100% rename from src/java/com/samskivert/xml/SimpleParser.java rename to src/main/java/com/samskivert/xml/SimpleParser.java diff --git a/src/java/com/samskivert/xml/ValidatedSetNextRule.java b/src/main/java/com/samskivert/xml/ValidatedSetNextRule.java similarity index 100% rename from src/java/com/samskivert/xml/ValidatedSetNextRule.java rename to src/main/java/com/samskivert/xml/ValidatedSetNextRule.java diff --git a/src/java/com/samskivert/xml/XMLUtil.java b/src/main/java/com/samskivert/xml/XMLUtil.java similarity index 100% rename from src/java/com/samskivert/xml/XMLUtil.java rename to src/main/java/com/samskivert/xml/XMLUtil.java diff --git a/src/java/com/samskivert/xml/package.html b/src/main/java/com/samskivert/xml/package.html similarity index 100% rename from src/java/com/samskivert/xml/package.html rename to src/main/java/com/samskivert/xml/package.html diff --git a/src/sql/create_site_tables.mysql b/src/main/sql/create_site_tables.mysql similarity index 100% rename from src/sql/create_site_tables.mysql rename to src/main/sql/create_site_tables.mysql diff --git a/src/sql/create_user_tables.mysql b/src/main/sql/create_user_tables.mysql similarity index 100% rename from src/sql/create_user_tables.mysql rename to src/main/sql/create_user_tables.mysql diff --git a/src/java/com/samskivert/io/tests/StreamUtilTest.java b/src/test/java/com/samskivert/io/StreamUtilTest.java similarity index 97% rename from src/java/com/samskivert/io/tests/StreamUtilTest.java rename to src/test/java/com/samskivert/io/StreamUtilTest.java index 332429e0..1ae8e245 100644 --- a/src/java/com/samskivert/io/tests/StreamUtilTest.java +++ b/src/test/java/com/samskivert/io/StreamUtilTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.io.tests; +package com.samskivert.io; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,8 +26,6 @@ import java.io.ByteArrayOutputStream; import org.junit.*; import static org.junit.Assert.*; -import com.samskivert.io.StreamUtil; - /** * Tests the {@link StreamUtil} class. */ diff --git a/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java similarity index 96% rename from src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java rename to src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java index 33e9e086..75da4b50 100644 --- a/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java +++ b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.servlet.tests; +package com.samskivert.servlet; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,9 +32,6 @@ import junit.framework.Test; import junit.framework.TestCase; import com.samskivert.io.StreamUtil; -import com.samskivert.servlet.Site; -import com.samskivert.servlet.SiteIdentifier; -import com.samskivert.servlet.SiteResourceLoader; import com.samskivert.test.TestUtil; public class SiteResourceLoaderTest extends TestCase diff --git a/src/java/com/samskivert/swing/tests/AdjustTestApp.java b/src/test/java/com/samskivert/swing/AdjustTestApp.java similarity index 96% rename from src/java/com/samskivert/swing/tests/AdjustTestApp.java rename to src/test/java/com/samskivert/swing/AdjustTestApp.java index eb34dff4..2d14e4ad 100644 --- a/src/java/com/samskivert/swing/tests/AdjustTestApp.java +++ b/src/test/java/com/samskivert/swing/AdjustTestApp.java @@ -18,14 +18,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.swing.tests; +package com.samskivert.swing; import java.awt.BorderLayout; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JFrame; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.PrefsConfig; /** diff --git a/src/java/com/samskivert/swing/tests/LabelDemo.java b/src/test/java/com/samskivert/swing/LabelDemo.java similarity index 98% rename from src/java/com/samskivert/swing/tests/LabelDemo.java rename to src/test/java/com/samskivert/swing/LabelDemo.java index 54d48a9b..fe464ebb 100644 --- a/src/java/com/samskivert/swing/tests/LabelDemo.java +++ b/src/test/java/com/samskivert/swing/LabelDemo.java @@ -18,14 +18,12 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.swing.tests; +package com.samskivert.swing; import java.awt.*; import java.io.*; import javax.swing.*; -import com.samskivert.swing.Label; - public class LabelDemo extends JPanel { public LabelDemo () diff --git a/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java similarity index 98% rename from src/java/com/samskivert/swing/tests/ProximityTrackerTest.java rename to src/test/java/com/samskivert/swing/ProximityTrackerTest.java index db4ad83a..3f1a12f6 100644 --- a/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java +++ b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.swing.tests; +package com.samskivert.swing; import java.awt.Point; import java.util.ArrayList; diff --git a/src/java/com/samskivert/swing/tests/TestComboButtonBox.java b/src/test/java/com/samskivert/swing/TestComboButtonBox.java similarity index 96% rename from src/java/com/samskivert/swing/tests/TestComboButtonBox.java rename to src/test/java/com/samskivert/swing/TestComboButtonBox.java index 6aa174dd..2b4c6650 100644 --- a/src/java/com/samskivert/swing/tests/TestComboButtonBox.java +++ b/src/test/java/com/samskivert/swing/TestComboButtonBox.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.swing.tests; +package com.samskivert.swing; import java.awt.Color; import java.awt.Graphics; @@ -28,8 +28,6 @@ import java.awt.image.BufferedImage; import javax.swing.DefaultComboBoxModel; import javax.swing.JFrame; -import com.samskivert.swing.ComboButtonBox; - /** * Tests the image button box. */ diff --git a/src/java/com/samskivert/util/tests/ArrayIntSetTest.java b/src/test/java/com/samskivert/util/ArrayIntSetTest.java similarity index 90% rename from src/java/com/samskivert/util/tests/ArrayIntSetTest.java rename to src/test/java/com/samskivert/util/ArrayIntSetTest.java index 0b35a237..772eb7be 100644 --- a/src/java/com/samskivert/util/tests/ArrayIntSetTest.java +++ b/src/test/java/com/samskivert/util/ArrayIntSetTest.java @@ -18,10 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; - -import com.samskivert.util.AbstractIntSet; -import com.samskivert.util.ArrayIntSet; +package com.samskivert.util; public class ArrayIntSetTest extends IntSetTestBase { diff --git a/src/java/com/samskivert/util/tests/ArrayUtilTest.java b/src/test/java/com/samskivert/util/ArrayUtilTest.java similarity index 98% rename from src/java/com/samskivert/util/tests/ArrayUtilTest.java rename to src/test/java/com/samskivert/util/ArrayUtilTest.java index fb1f9f7d..7d9ed986 100644 --- a/src/java/com/samskivert/util/tests/ArrayUtilTest.java +++ b/src/test/java/com/samskivert/util/ArrayUtilTest.java @@ -18,14 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.ArrayUtil; -import com.samskivert.util.StringUtil; - import static com.samskivert.Log.log; /** diff --git a/src/java/com/samskivert/util/tests/CheapIntMapTest.java b/src/test/java/com/samskivert/util/CheapIntMapTest.java similarity index 96% rename from src/java/com/samskivert/util/tests/CheapIntMapTest.java rename to src/test/java/com/samskivert/util/CheapIntMapTest.java index e9093470..da950c65 100644 --- a/src/java/com/samskivert/util/tests/CheapIntMapTest.java +++ b/src/test/java/com/samskivert/util/CheapIntMapTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.CheapIntMap; - /** * Tests the {@link CheapIntMap} class. */ diff --git a/src/java/com/samskivert/util/tests/CollectionUtilTest.java b/src/test/java/com/samskivert/util/CollectionUtilTest.java similarity index 93% rename from src/java/com/samskivert/util/tests/CollectionUtilTest.java rename to src/test/java/com/samskivert/util/CollectionUtilTest.java index 4052c7af..7203576e 100644 --- a/src/java/com/samskivert/util/tests/CollectionUtilTest.java +++ b/src/test/java/com/samskivert/util/CollectionUtilTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.ArrayList; import java.util.List; @@ -27,9 +27,6 @@ import java.util.Random; import org.junit.*; import static org.junit.Assert.*; -import com.samskivert.util.CollectionUtil; -import com.samskivert.util.ComparableArrayList; - /** * Tests the {@link CollectionUtil} class. */ diff --git a/src/java/com/samskivert/util/tests/ConfigTest.java b/src/test/java/com/samskivert/util/ConfigTest.java similarity index 94% rename from src/java/com/samskivert/util/tests/ConfigTest.java rename to src/test/java/com/samskivert/util/ConfigTest.java index 891473ce..8c1a2cb1 100644 --- a/src/java/com/samskivert/util/tests/ConfigTest.java +++ b/src/test/java/com/samskivert/util/ConfigTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.Iterator; import java.util.Properties; @@ -26,10 +26,6 @@ import java.util.Properties; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.Config; -import com.samskivert.util.PrefsConfig; -import com.samskivert.util.StringUtil; - /** * Tests the {@link Config} class. */ diff --git a/src/java/com/samskivert/util/tests/ConfigUtilTest.java b/src/test/java/com/samskivert/util/ConfigUtilTest.java similarity index 97% rename from src/java/com/samskivert/util/tests/ConfigUtilTest.java rename to src/test/java/com/samskivert/util/ConfigUtilTest.java index 681ff3d1..1e1921bf 100644 --- a/src/java/com/samskivert/util/tests/ConfigUtilTest.java +++ b/src/test/java/com/samskivert/util/ConfigUtilTest.java @@ -18,15 +18,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.Properties; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.ConfigUtil; - /** * Our test properties files: * diff --git a/src/java/com/samskivert/util/tests/HashIntMapTest.java b/src/test/java/com/samskivert/util/HashIntMapTest.java similarity index 97% rename from src/java/com/samskivert/util/tests/HashIntMapTest.java rename to src/test/java/com/samskivert/util/HashIntMapTest.java index f46b5524..33840f49 100644 --- a/src/java/com/samskivert/util/tests/HashIntMapTest.java +++ b/src/test/java/com/samskivert/util/HashIntMapTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.io.*; import java.util.ArrayList; @@ -27,9 +27,6 @@ import java.util.Collections; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.HashIntMap; -import com.samskivert.util.StringUtil; - public class HashIntMapTest extends TestCase { public HashIntMapTest () diff --git a/src/java/com/samskivert/util/tests/HashIntSetTest.java b/src/test/java/com/samskivert/util/HashIntSetTest.java similarity index 90% rename from src/java/com/samskivert/util/tests/HashIntSetTest.java rename to src/test/java/com/samskivert/util/HashIntSetTest.java index 665667f6..06d05a88 100644 --- a/src/java/com/samskivert/util/tests/HashIntSetTest.java +++ b/src/test/java/com/samskivert/util/HashIntSetTest.java @@ -18,10 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; - -import com.samskivert.util.AbstractIntSet; -import com.samskivert.util.HashIntSet; +package com.samskivert.util; public class HashIntSetTest extends IntSetTestBase { diff --git a/src/java/com/samskivert/util/tests/IntListUtilTest.java b/src/test/java/com/samskivert/util/IntListUtilTest.java similarity index 98% rename from src/java/com/samskivert/util/tests/IntListUtilTest.java rename to src/test/java/com/samskivert/util/IntListUtilTest.java index 45020de9..64e09ccd 100644 --- a/src/java/com/samskivert/util/tests/IntListUtilTest.java +++ b/src/test/java/com/samskivert/util/IntListUtilTest.java @@ -18,15 +18,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.Arrays; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.IntListUtil; - public class IntListUtilTest extends TestCase { public IntListUtilTest () diff --git a/src/java/com/samskivert/util/tests/IntSetTestBase.java b/src/test/java/com/samskivert/util/IntSetTestBase.java similarity index 97% rename from src/java/com/samskivert/util/tests/IntSetTestBase.java rename to src/test/java/com/samskivert/util/IntSetTestBase.java index 068fcc0c..dd080d08 100644 --- a/src/java/com/samskivert/util/tests/IntSetTestBase.java +++ b/src/test/java/com/samskivert/util/IntSetTestBase.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.Arrays; import java.util.Random; @@ -28,8 +28,6 @@ import java.util.TreeSet; import org.junit.*; import static org.junit.Assert.*; -import com.samskivert.util.AbstractIntSet; - public abstract class IntSetTestBase { @Test diff --git a/src/java/com/samskivert/util/tests/LRUHashMapTest.java b/src/test/java/com/samskivert/util/LRUHashMapTest.java similarity index 96% rename from src/java/com/samskivert/util/tests/LRUHashMapTest.java rename to src/test/java/com/samskivert/util/LRUHashMapTest.java index a635c055..22c3c991 100644 --- a/src/java/com/samskivert/util/tests/LRUHashMapTest.java +++ b/src/test/java/com/samskivert/util/LRUHashMapTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.LRUHashMap; - /** * Tests the {@link LRUHashMap} class. */ diff --git a/src/java/com/samskivert/util/tests/ObserverListTest.java b/src/test/java/com/samskivert/util/ObserverListTest.java similarity index 97% rename from src/java/com/samskivert/util/tests/ObserverListTest.java rename to src/test/java/com/samskivert/util/ObserverListTest.java index da645d82..2a9fe3f9 100644 --- a/src/java/com/samskivert/util/tests/ObserverListTest.java +++ b/src/test/java/com/samskivert/util/ObserverListTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.ObserverList; - /** * Tests the {@link ObserverList} class. */ diff --git a/src/java/com/samskivert/util/tests/QuickSortTest.java b/src/test/java/com/samskivert/util/QuickSortTest.java similarity index 98% rename from src/java/com/samskivert/util/tests/QuickSortTest.java rename to src/test/java/com/samskivert/util/QuickSortTest.java index d89220de..cf01c78a 100644 --- a/src/java/com/samskivert/util/tests/QuickSortTest.java +++ b/src/test/java/com/samskivert/util/QuickSortTest.java @@ -18,15 +18,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.Comparator; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.QuickSort; - /** * Tests the {@link QuickSort} class. */ diff --git a/src/java/com/samskivert/util/tests/RunnablesTest.java b/src/test/java/com/samskivert/util/RunnablesTest.java similarity index 96% rename from src/java/com/samskivert/util/tests/RunnablesTest.java rename to src/test/java/com/samskivert/util/RunnablesTest.java index b90d5cfa..be91d45f 100644 --- a/src/java/com/samskivert/util/tests/RunnablesTest.java +++ b/src/test/java/com/samskivert/util/RunnablesTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import org.junit.*; import static org.junit.Assert.*; -import com.samskivert.util.Runnables; - /** * Does something extraordinary. */ diff --git a/src/java/com/samskivert/util/tests/SerialExecutorTest.java b/src/test/java/com/samskivert/util/SerialExecutorTest.java similarity index 96% rename from src/java/com/samskivert/util/tests/SerialExecutorTest.java rename to src/test/java/com/samskivert/util/SerialExecutorTest.java index bec5ea33..fc8dd10f 100644 --- a/src/java/com/samskivert/util/tests/SerialExecutorTest.java +++ b/src/test/java/com/samskivert/util/SerialExecutorTest.java @@ -18,17 +18,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import java.util.concurrent.Executor; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.Queue; -import com.samskivert.util.RunQueue; -import com.samskivert.util.SerialExecutor; - /** * Tests the {@link SerialExecutor} class. */ diff --git a/src/java/com/samskivert/util/tests/StringUtilTest.java b/src/test/java/com/samskivert/util/StringUtilTest.java similarity index 96% rename from src/java/com/samskivert/util/tests/StringUtilTest.java rename to src/test/java/com/samskivert/util/StringUtilTest.java index 00b4b436..73d6f892 100644 --- a/src/java/com/samskivert/util/tests/StringUtilTest.java +++ b/src/test/java/com/samskivert/util/StringUtilTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.StringUtil; - public class StringUtilTest extends TestCase { public StringUtilTest () diff --git a/src/java/com/samskivert/util/tests/SystemInfoDemo.java b/src/test/java/com/samskivert/util/SystemInfoDemo.java similarity index 95% rename from src/java/com/samskivert/util/tests/SystemInfoDemo.java rename to src/test/java/com/samskivert/util/SystemInfoDemo.java index 8442468a..eced81a7 100644 --- a/src/java/com/samskivert/util/tests/SystemInfoDemo.java +++ b/src/test/java/com/samskivert/util/SystemInfoDemo.java @@ -18,9 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; - -import com.samskivert.util.SystemInfo; +package com.samskivert.util; public class SystemInfoDemo { diff --git a/src/java/com/samskivert/util/tests/ThrottleTest.java b/src/test/java/com/samskivert/util/ThrottleTest.java similarity index 97% rename from src/java/com/samskivert/util/tests/ThrottleTest.java rename to src/test/java/com/samskivert/util/ThrottleTest.java index 629fdda2..dcc6bd6e 100644 --- a/src/java/com/samskivert/util/tests/ThrottleTest.java +++ b/src/test/java/com/samskivert/util/ThrottleTest.java @@ -18,13 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.util.tests; +package com.samskivert.util; import junit.framework.Test; import junit.framework.TestCase; -import com.samskivert.util.Throttle; - /** * A test case for {@link Throttle}. */ diff --git a/src/java/com/samskivert/velocity/tests/VelocityTest.java b/src/test/java/com/samskivert/velocity/VelocityTest.java similarity index 94% rename from src/java/com/samskivert/velocity/tests/VelocityTest.java rename to src/test/java/com/samskivert/velocity/VelocityTest.java index 7883fa18..63761968 100644 --- a/src/java/com/samskivert/velocity/tests/VelocityTest.java +++ b/src/test/java/com/samskivert/velocity/VelocityTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.velocity.tests; +package com.samskivert.velocity; import java.io.StringWriter; @@ -28,8 +28,6 @@ import org.apache.velocity.app.VelocityEngine; import org.junit.*; import static org.junit.Assert.*; -import com.samskivert.velocity.VelocityUtil; - /** * Tests some Velocity stuff. */ diff --git a/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java similarity index 97% rename from src/java/com/samskivert/xml/tests/SetFieldRuleTest.java rename to src/test/java/com/samskivert/xml/SetFieldRuleTest.java index 91fcec46..08d525d4 100644 --- a/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java +++ b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.xml.tests; +package com.samskivert.xml; import java.io.InputStream; import java.io.FileInputStream; @@ -30,7 +30,6 @@ import org.apache.commons.digester.Digester; import com.samskivert.test.TestUtil; import com.samskivert.util.StringUtil; -import com.samskivert.xml.SetFieldRule; public class SetFieldRuleTest extends TestCase {