Author: shawkins Date: 2009-02-26 16:30:22 -0500 (Thu, 26 Feb 2009) New Revision: 515 Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelper.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/CommandShell.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestCommand.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/GenerateCanonical.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeUtil.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstitutionVisitor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java Log: removing unused imports Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelper.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelper.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelper.java 2009-02-26 21:30:22 UTC (rev 515) @@ -28,7 +28,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/CommandShell.java =================================================================== --- trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/CommandShell.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/CommandShell.java 2009-02-26 21:30:22 UTC (rev 515) @@ -29,9 +29,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.Stack; @@ -40,8 +38,6 @@ import com.metamatrix.core.CorePlugin; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.log.FileLogWriter; -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.SystemLogWriter; import com.metamatrix.core.util.FileUtil; import com.metamatrix.core.util.MetaMatrixExceptionUtil; import com.metamatrix.core.util.StringUtil; Modified: trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestCommand.java =================================================================== --- trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestCommand.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestCommand.java 2009-02-26 21:30:22 UTC (rev 515) @@ -24,6 +24,8 @@ import java.util.TimeZone; import junit.framework.TestCase; + +import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.core.util.UnitTestUtil; public class TestCommand extends TestCase { @@ -33,11 +35,11 @@ } public void setUp() { - TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$ + TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$ } public void tearDown() { - TimeZone.setDefault(null); + TimestampWithTimezone.resetCalendar(null); } public void test() throws Exception { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java =================================================================== --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java 2009-02-26 21:30:22 UTC (rev 515) @@ -24,8 +24,8 @@ package com.metamatrix.connector.xml.soap; -import java.text.MessageFormat; -import java.util.Properties; +import java.text.MessageFormat; +import java.util.Properties; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -34,10 +34,9 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; -import com.metamatrix.connector.xml.SOAPConnectorState; -import com.metamatrix.connector.xml.base.Messages; +import com.metamatrix.connector.xml.SOAPConnectorState; +import com.metamatrix.connector.xml.base.Messages; import com.metamatrix.connector.xml.http.HTTPConnectorState; -import com.metamatrix.connector.xmlsource.soap.SecurityToken; /** * Contains the data needed to create the SOAP Envelope around an XML Document. Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java =================================================================== --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -45,7 +45,6 @@ import org.apache.axis.client.Service; import org.apache.axis.configuration.SimpleProvider; import org.apache.axis.handlers.SimpleSessionHandler; -import org.apache.axis.message.MessageElement; import org.apache.axis.message.SOAPBodyElement; import org.apache.axis.message.SOAPEnvelope; import org.apache.axis.soap.SOAPConstants; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java =================================================================== --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java 2009-02-26 21:30:22 UTC (rev 515) @@ -23,7 +23,6 @@ package com.metamatrix.connector.xmlsource; import org.teiid.connector.api.Connection; -import org.teiid.connector.api.Connector; import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; @@ -32,8 +31,7 @@ import org.teiid.connector.basic.BasicConnector; /** - * XML Source connector, will give provide a XML document as source to - * Metamatrix engine. + * XML Source connector */ @ConnectionPooling public class XMLSourceConnector extends BasicConnector { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java =================================================================== --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java 2009-02-26 21:30:22 UTC (rev 515) @@ -27,25 +27,21 @@ import java.util.Iterator; import java.util.List; +import junit.framework.TestCase; + import org.teiid.connector.api.ConnectorException; import org.teiid.connector.language.IBaseInCriteria; import org.teiid.connector.language.ICompareCriteria; import org.teiid.connector.language.ICriteria; import org.teiid.connector.language.IElement; import org.teiid.connector.language.IExpression; -import org.teiid.connector.language.IFrom; -import org.teiid.connector.language.IGroup; import org.teiid.connector.language.IQuery; -import org.teiid.connector.language.ISelect; import org.teiid.connector.language.ISelectSymbol; import org.teiid.connector.language.LanguageUtil; import org.teiid.connector.metadata.runtime.Element; -import org.teiid.connector.metadata.runtime.Group; import org.teiid.connector.metadata.runtime.RuntimeMetadata; -import junit.framework.TestCase; - /** * created by JChoate on Jun 27, 2005 * Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java =================================================================== --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,8 +22,6 @@ package com.metamatrix.connector.xml.base; -import org.teiid.connector.api.ConnectorException; - import junit.framework.TestCase; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java =================================================================== --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,10 +22,6 @@ package com.metamatrix.connector.xml.base; -import java.util.List; - -import org.teiid.connector.api.ConnectorCapabilities; - import junit.framework.TestCase; @@ -83,7 +79,7 @@ * Class under test for List getSupportedFunctions() */ public void testGetSupportedFunctions() { - List funcs = m_caps.getSupportedFunctions(); + assertNotNull(m_caps.getSupportedFunctions()); } public void testSupportsSelectDistinct() { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java =================================================================== --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -29,7 +29,6 @@ import org.jdom.Document; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.api.ConnectorLogger; import com.metamatrix.cdk.api.SysLogger; Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java =================================================================== --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,8 +22,6 @@ package com.metamatrix.connector.jdbc.oracle.spatial; -import java.util.List; - import org.teiid.connector.language.IExpression; import org.teiid.connector.language.IFunction; Modified: trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java =================================================================== --- trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java 2009-02-26 21:30:22 UTC (rev 515) @@ -33,10 +33,8 @@ import java.util.Iterator; import com.metamatrix.api.exception.security.AuthorizationException; -import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.HostID; -import com.metamatrix.common.config.api.HostType; import com.metamatrix.common.config.api.ReleaseInfo; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.MetaMatrixProductNames; Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java =================================================================== --- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java 2009-02-26 21:30:22 UTC (rev 515) @@ -23,7 +23,6 @@ //############################################################################# package com.metamatrix.console.ui.views.deploy.util; -import com.metamatrix.common.config.api.HostType; /** * @version 1.0 Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java 2009-02-26 21:30:22 UTC (rev 515) @@ -27,7 +27,6 @@ import org.teiid.connector.visitor.framework.LanguageObjectVisitor; import com.metamatrix.core.util.HashCodeUtil; -import com.metamatrix.metadata.runtime.api.MetadataID; public class GroupImpl extends BaseLanguageObject implements IGroup { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java 2009-02-26 21:30:22 UTC (rev 515) @@ -31,8 +31,6 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -import org.teiid.connector.xa.api.XAConnection; - import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java 2009-02-26 21:30:22 UTC (rev 515) @@ -28,8 +28,6 @@ import java.io.ObjectOutput; import java.util.List; -import org.teiid.connector.api.ConnectorException; - import com.metamatrix.common.batch.BatchSerializer; import com.metamatrix.core.util.ExternalizeUtil; Modified: trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/GenerateCanonical.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/GenerateCanonical.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/GenerateCanonical.java 2009-02-26 21:30:22 UTC (rev 515) @@ -30,7 +30,6 @@ import com.metamatrix.api.exception.query.QueryPlannerException; import com.metamatrix.query.execution.QueryExecPlugin; import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.optimizer.relational.plantree.JoinStrategyType; import com.metamatrix.query.optimizer.relational.plantree.NodeConstants; import com.metamatrix.query.optimizer.relational.plantree.NodeFactory; Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeUtil.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeUtil.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeUtil.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,8 +22,6 @@ package com.metamatrix.query.processor.relational; -import java.util.Collections; - import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.CriteriaEvaluationException; import com.metamatrix.common.buffer.BlockedException; @@ -37,7 +35,6 @@ import com.metamatrix.query.sql.lang.SetQuery; import com.metamatrix.query.sql.lang.Update; import com.metamatrix.query.sql.symbol.Constant; -import com.metamatrix.query.sql.visitor.ElementCollectorVisitor; import com.metamatrix.query.sql.visitor.EvaluateExpressionVisitor; Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java 2009-02-26 21:30:22 UTC (rev 515) @@ -50,7 +50,6 @@ import com.metamatrix.api.exception.query.FunctionExecutionException; import com.metamatrix.api.exception.query.InvalidFunctionException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.api.exception.query.QueryProcessingException; import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.buffer.BlockedException; Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstitutionVisitor.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstitutionVisitor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstitutionVisitor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -49,8 +49,6 @@ import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.sql.symbol.Expression; -import com.metamatrix.query.sql.symbol.GroupSymbol; -import com.metamatrix.query.sql.symbol.Reference; import com.metamatrix.query.sql.visitor.ExpressionMappingVisitor; import com.metamatrix.query.sql.visitor.ReferenceCollectorVisitor; import com.metamatrix.query.sql.visitor.VariableCollectorVisitor; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2009-02-26 21:30:22 UTC (rev 515) @@ -54,7 +54,6 @@ import com.metamatrix.query.sql.visitor.ElementCollectorVisitor; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataFactory; -import com.metamatrix.query.unittest.FakeMetadataObject; import com.metamatrix.query.util.CommandContext;