[teiid-commits] teiid SVN: r513 - in trunk: engine/src/test/java/com/metamatrix/query/processor/relational and 11 other directories.

Author: shawkins Date: 2009-02-26 16:26:48 -0500 (Thu, 26 Feb 2009) New Revision: 513 Removed: trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceConstants.java Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestRuleChooseDependent.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/TestSelectNode.java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewriter.java trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIndexMetadataService.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCurrentConfigurationReader.java trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmin.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExtensionModuleManager.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java Log: removing unused imports Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestRuleChooseDependent.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestRuleChooseDependent.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rules/TestRuleChooseDependent.java 2009-02-26 21:26:48 UTC (rev 513) @@ -40,7 +40,6 @@ import com.metamatrix.query.optimizer.relational.RuleStack; import com.metamatrix.query.optimizer.relational.plantree.JoinStrategyType; import com.metamatrix.query.optimizer.relational.plantree.NodeConstants; -import com.metamatrix.query.optimizer.relational.plantree.NodeEditor; import com.metamatrix.query.optimizer.relational.plantree.NodeFactory; import com.metamatrix.query.optimizer.relational.plantree.PlanNode; import com.metamatrix.query.rewriter.QueryRewriter; Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/relational/TestSelectNode.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/processor/relational/TestSelectNode.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/processor/relational/TestSelectNode.java 2009-02-26 21:26:48 UTC (rev 513) @@ -31,7 +31,6 @@ import junit.framework.TestCase; import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.MetaMatrixException; import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.buffer.BufferManager; Modified: trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewriter.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewriter.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewriter.java 2009-02-26 21:26:48 UTC (rev 513) @@ -41,6 +41,7 @@ import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -2094,11 +2095,11 @@ } public void testRewriteFromUnixTime() throws Exception { - TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$ + TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-06:00")); try { helpTestRewriteCriteria("from_unixtime(pm1.g1.e2) = '1992-12-01 07:00:00'", "timestampadd(SQL_TSI_SECOND, pm1.g1.e2, {ts'1969-12-31 18:00:00.0'}) = {ts'1992-12-01 07:00:00.0'}"); //$NON-NLS-1$ //$NON-NLS-2$ } finally { - TimeZone.setDefault(null); + TimestampWithTimezone.resetCalendar(null); } } Modified: trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIndexMetadataService.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIndexMetadataService.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIndexMetadataService.java 2009-02-26 21:26:48 UTC (rev 513) @@ -37,7 +37,6 @@ import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.VDBService; import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.SupportConstants; public class TestIndexMetadataService extends TestCase { private QueryMetadataInterface metadata; Deleted: trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceConstants.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceConstants.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceConstants.java 2009-02-26 21:26:48 UTC (rev 513) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.config.service; - -import com.metamatrix.common.config.ResourceNames; - -public interface ConfigurationServiceConstants { - public static final String NAME = "ConfigurationService"; -} Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCurrentConfigurationReader.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCurrentConfigurationReader.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCurrentConfigurationReader.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,14 +22,11 @@ package com.metamatrix.platform.config.spi.xml; -import java.util.Collection; import java.util.Properties; import com.metamatrix.common.config.StartupStateException; import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationModelContainer; -import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.config.api.HostID; import com.metamatrix.common.config.api.exceptions.ConfigurationConnectionException; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.config.reader.CurrentConfigurationReader; Modified: trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmin.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmin.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmin.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,7 +22,6 @@ package com.metamatrix.platform.service.api; -import java.rmi.Remote; import java.util.Map; import java.util.Properties; Modified: trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryService.java 2009-02-26 21:26:48 UTC (rev 513) @@ -35,7 +35,6 @@ import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.api.exception.server.InvalidRequestIDException; import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.comm.ClientServiceRegistry; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-26 21:26:48 UTC (rev 513) @@ -21,29 +21,25 @@ */ package com.metamatrix.admin.server; -import java.io.File; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; +import java.io.File; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.admin.api.exception.AdminException; +import com.metamatrix.admin.api.objects.Host; +import com.metamatrix.core.util.ObjectConverterUtil; +import com.metamatrix.core.util.UnitTestUtil; +import com.metamatrix.metadata.runtime.api.Model; +import com.metamatrix.metadata.runtime.api.VirtualDatabase; +import com.metamatrix.metadata.runtime.api.VirtualDatabaseID; +import com.metamatrix.platform.registry.ClusteredRegistryState; +import com.metamatrix.platform.registry.FakeRegistryUtil; -import junit.framework.TestCase; -import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.DefaultCacheFactory; - -import com.metamatrix.admin.api.exception.AdminException; -import com.metamatrix.admin.api.objects.Host; -import com.metamatrix.core.util.ObjectConverterUtil; -import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.metadata.runtime.api.Model; -import com.metamatrix.metadata.runtime.api.VirtualDatabase; -import com.metamatrix.metadata.runtime.api.VirtualDatabaseID; -import com.metamatrix.platform.registry.ClusteredRegistryState; -import com.metamatrix.platform.registry.FakeRegistryUtil; - - /** * Unit tests of ServerMonitoringAdminImpl * @since 4.3 Modified: trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExtensionModuleManager.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExtensionModuleManager.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExtensionModuleManager.java 2009-02-26 21:26:48 UTC (rev 513) @@ -47,7 +47,6 @@ import com.metamatrix.common.extensionmodule.exception.InvalidExtensionModuleTypeException; import com.metamatrix.common.messaging.MessageBusConstants; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.core.CoreConstants; public class TestExtensionModuleManager extends TestCase { Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java 2009-02-26 21:26:48 UTC (rev 513) @@ -34,7 +34,6 @@ import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.api.DeployedComponent; import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.config.api.HostType; import com.metamatrix.common.config.api.SharedResource; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.core.util.ArgCheck; Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java 2009-02-26 21:26:48 UTC (rev 513) @@ -28,7 +28,6 @@ import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.util.VMNaming; import com.metamatrix.platform.config.BaseTest; import com.metamatrix.platform.config.CurrentConfigHelper; Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,40 +22,39 @@ package com.metamatrix.soap.servlet; -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.metamatrix.common.api.MMURL; -import com.metamatrix.common.api.MMURL.CONNECTION; -import com.metamatrix.common.util.WSDLServletUtil; -import com.metamatrix.core.CoreConstants; -import com.metamatrix.core.log.FileLogWriter; -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.core.util.StringUtil; -import com.metamatrix.soap.SOAPPlugin; -import com.metamatrix.soap.util.ErrorMessageKeys; -import com.metamatrix.soap.util.SOAPConstants; +import com.metamatrix.common.util.WSDLServletUtil; +import com.metamatrix.core.CoreConstants; +import com.metamatrix.core.log.FileLogWriter; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.core.log.MessageLevel; +import com.metamatrix.core.util.StringUtil; +import com.metamatrix.soap.SOAPPlugin; +import com.metamatrix.soap.util.ErrorMessageKeys; +import com.metamatrix.soap.util.SOAPConstants; import com.metamatrix.soap.util.WebServiceUtil; Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java =================================================================== --- trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,14 +22,13 @@ package com.metamatrix.cdk.api; +import junit.framework.TestCase; + import org.teiid.connector.language.ICommand; import org.teiid.connector.language.IGroup; import org.teiid.connector.language.IQuery; import org.teiid.connector.metadata.runtime.MetadataObject; -import org.teiid.connector.metadata.runtime.RuntimeMetadata; -import junit.framework.TestCase; - import com.metamatrix.core.util.UnitTestUtil; public class TestTranslationUtility extends TestCase {