[teiid-commits] teiid SVN: r4143 - in trunk: api/src/main/java/org/teiid/translator and 41 other directories.

Author: rareddy Date: 2012-05-24 15:29:03 -0400 (Thu, 24 May 2012) New Revision: 4143 Modified: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java trunk/engine/pom.xml trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java trunk/jboss-integration/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java trunk/test-integration/db/pom.xml trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java Log: misc: NLS warnings cleanup in tests; bunch more to still there. Modified: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java =================================================================== --- trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -16,6 +16,7 @@ /** * An extension of Groovy's Sql to support getting {@link TeiidStatement} specific properties. */ +@SuppressWarnings("nls") public final class TeiidSql extends Sql { private int maxRows; private PlanNode plan; Modified: trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java =================================================================== --- trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/api/src/main/java/org/teiid/translator/DataNotAvailableException.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -21,7 +21,6 @@ */ package org.teiid.translator; -import org.teiid.core.BundleUtil; import org.teiid.core.TeiidRuntimeException; /** Modified: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -161,6 +161,7 @@ * @param exception * @return */ + @SuppressWarnings("deprecation") private static Throwable findRootException(Throwable exception) { if (exception instanceof TeiidRuntimeException) { while (exception.getCause() != exception Modified: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java =================================================================== --- trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -37,6 +37,7 @@ /** * @since 4.3 */ +@SuppressWarnings("nls") public class TestBatchResults { static class MockBatchFetcher implements BatchFetcher { Modified: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java =================================================================== --- trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -41,7 +41,7 @@ import org.teiid.client.xa.XidImpl; import org.teiid.net.ServerConnection; - +@SuppressWarnings("nls") public class TestConnection extends TestCase { protected static final String STD_DATABASE_NAME = "QT_Ora9DS"; //$NON-NLS-1$ Modified: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java =================================================================== --- trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -32,7 +32,7 @@ import org.teiid.jdbc.WrapperImpl; import junit.framework.TestCase; - +@SuppressWarnings("nls") public class TestWrapperImpl extends TestCase { interface Foo extends Wrapper { Modified: trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java =================================================================== --- trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/client/src/test/java/org/teiid/net/socket/TestServiceInvocationStruct.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -29,7 +29,7 @@ import junit.framework.TestCase; - +@SuppressWarnings("nls") public class TestServiceInvocationStruct extends TestCase { public void testSerialize() throws Exception { Modified: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java =================================================================== --- trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -56,7 +56,8 @@ assertNotNull(e); } - public void testMetaMatrixExceptionWithNullThrowable() { + @SuppressWarnings("deprecation") + public void testMetaMatrixExceptionWithNullThrowable() { final TeiidException err = new TeiidException((Throwable)null); assertNull(err.getChild()); assertNull(err.getCode()); @@ -64,7 +65,8 @@ } - public void testMetaMatrixExceptionWithMessage() { + @SuppressWarnings("deprecation") + public void testMetaMatrixExceptionWithMessage() { final TeiidException err = new TeiidException("Test"); //$NON-NLS-1$ assertNull(err.getChild()); assertNull(err.getCode()); @@ -75,6 +77,7 @@ Code, propertyValuePhrase, } + @SuppressWarnings("deprecation") public void testMetaMatrixExceptionWithCodeAndMessage() { final TeiidException err = new TeiidException(Event.Code, "Test"); //$NON-NLS-1$ assertNull(err.getChild()); @@ -83,7 +86,7 @@ } - + @SuppressWarnings("deprecation") public void testMetaMatrixExceptionWithExceptionAndMessage() { final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$ final TeiidException err = new TeiidException(child, "Test"); //$NON-NLS-1$ @@ -92,7 +95,7 @@ assertEquals("Error Code:propertyValuePhrase Message:Test", err.getMessage()); //$NON-NLS-1$ } - + @SuppressWarnings("deprecation") public void testMetaMatrixExceptionWithExceptionAndCodeAndMessage() { final TeiidException child = new TeiidException(Event.propertyValuePhrase, "Child"); //$NON-NLS-1$ final TeiidException err = new TeiidException(Event.Code,child, "Test"); //$NON-NLS-1$ Modified: trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java =================================================================== --- trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -44,6 +44,7 @@ * <p>Test cases for {@link CryptoFactory} and carious <code>Encryptor</code> * and <code>Decryptor</code> implementations. </p> */ +@SuppressWarnings("nls") public class TestEncryptDecrypt { // Some strings for testing... Modified: trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java =================================================================== --- trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -43,6 +43,7 @@ /** * Tests primarily the various cloning scenarios available with PropertiesUtils */ +@SuppressWarnings("nls") public class TestPropertiesUtils extends TestCase { private final static String TEMP_FILE = UnitTestUtil.getTestScratchPath() + "/temp.properties"; //$NON-NLS-1$ Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TestEscapeSyntaxModifier.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -38,6 +38,7 @@ /** */ +@SuppressWarnings("nls") public class TestEscapeSyntaxModifier extends TestCase { /** Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/modeshape/TestPathFunctionModifier.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -27,8 +27,6 @@ import junit.framework.TestCase; -import org.junit.Test; -import org.teiid.cdk.api.TranslationUtility; import org.teiid.language.Expression; import org.teiid.language.Function; import org.teiid.language.LanguageFactory; @@ -38,6 +36,7 @@ /** */ +@SuppressWarnings("nls") public class TestPathFunctionModifier extends TestCase { private static final LanguageFactory LANG_FACTORY = new LanguageFactory(); Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorDatetimeConversion.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -38,6 +38,7 @@ /** */ +@SuppressWarnings("nls") public class TestNetezzaTranslatorDatetimeConversion { private static NetezzaExecutionFactory TRANSLATOR; @@ -54,11 +55,6 @@ /////////////////UTILLITY FUNCTIONS///////// //////////////////////////////////////////// - private String getTestVDB() { - //return TranslationHelper.NETEZZA_VDB; - return TranslationHelper.PARTS_VDB; - } - private String getTestBQTVDB() { return TranslationHelper.BQT_VDB; } Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorSourceSystemFunctions.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -30,6 +30,7 @@ /** */ +@SuppressWarnings("nls") public class TestNetezzaTranslatorSourceSystemFunctions { private static NetezzaExecutionFactory TRANSLATOR; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestNetezzaTranslatorTypeMapping.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -36,7 +36,7 @@ import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TranslationHelper; - +@SuppressWarnings("nls") public class TestNetezzaTranslatorTypeMapping { private static NetezzaExecutionFactory TRANSLATOR; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/netezza/TestSubstringFunctionModifier.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -34,6 +34,7 @@ /** */ +@SuppressWarnings("nls") public class TestSubstringFunctionModifier extends TestCase { private static final LanguageFactory LANG_FACTORY = new LanguageFactory(); Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/pom.xml 2012-05-24 19:29:03 UTC (rev 4143) @@ -26,6 +26,35 @@ </executions> </plugin> </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <versionRange>[2.4,)</versionRange> + <goals> + <goal>javacc</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <dependencies> Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourceMetadataWrapper.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -134,7 +134,7 @@ boolean elementExists = false; for(int i=0; i<elements.size(); i++) { Object elemID = elements.get(i); - if(actualMetadata.getName(elemID).equalsIgnoreCase(MultiSourceElement.MULTI_SOURCE_ELEMENT_NAME)) { //$NON-NLS-1$ + if(actualMetadata.getName(elemID).equalsIgnoreCase(MultiSourceElement.MULTI_SOURCE_ELEMENT_NAME)) { // Replace the element with a MultiSourceElement elements.set(i, new MultiSourceElement(groupID, i+1, fullName)); elementExists = true; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -216,7 +216,7 @@ if (RelationalNodeUtil.isUpdate(accessNode.getCommand())) { update = true; GroupingNode groupNode = new GroupingNode(getID()); - AggregateSymbol sumCount = new AggregateSymbol(NonReserved.SUM, false, accessNode.getElements().get(0)); //$NON-NLS-1$ + AggregateSymbol sumCount = new AggregateSymbol(NonReserved.SUM, false, accessNode.getElements().get(0)); List<Expression> outputElements = new ArrayList<Expression>(1); outputElements.add(sumCount); groupNode.setElements(outputElements); Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -71,7 +71,7 @@ } public String toString() { - return "BasicSourceCapabilities<caps=" + capabilityMap + ", funcs=" + functionMap + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + return "BasicSourceCapabilities<caps=" + capabilityMap + ", funcs=" + functionMap + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -287,7 +287,7 @@ } else if(namespacePrefix.equals(MappingNodeConstants.INSTANCES_NAMESPACE_PREFIX)) { uri = MappingNodeConstants.INSTANCES_NAMESPACE; }else { - String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30213, new Object[] {namespacePrefix, name}); //$NON-NLS-1$ + String msg = QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30213, new Object[] {namespacePrefix, name}); throw new TeiidComponentException(QueryPlugin.Event.TEIID30213, msg); } } Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-24 19:29:03 UTC (rev 4143) @@ -32,7 +32,7 @@ * file. <B>WARNING:</B> DO NOT MODIFY the SQLParser.java file as it will be * regenerated from the .jj file and your changes will be lost!</p> */ -@SuppressWarnings("nls") +@SuppressWarnings({"nls", "unused"}) public class SQLParser extends SQLParserUtil { } // end class Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestLikeCriteriaImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -49,7 +49,7 @@ } public static Like example(String right, char escape, boolean negated) throws Exception { - return (Like)TstLanguageBridgeFactory.factory.translate(helpExample(right, escape, negated)); + return TstLanguageBridgeFactory.factory.translate(helpExample(right, escape, negated)); } public void testGetLeftExpression() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestSubqueryInCriteriaImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -52,7 +52,7 @@ } public static SubqueryIn example() throws Exception { - return (SubqueryIn)TstLanguageBridgeFactory.factory.translate(helpExample()); + return TstLanguageBridgeFactory.factory.translate(helpExample()); } public void testGetExpression() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestUpdateImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -31,7 +31,7 @@ import org.teiid.query.sql.symbol.Constant; import org.teiid.query.sql.symbol.GroupSymbol; - +@SuppressWarnings("nls") public class TestUpdateImpl extends TestCase { /** Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -42,8 +42,8 @@ import org.teiid.cache.CacheConfiguration; import org.teiid.cache.DefaultCacheFactory; import org.teiid.client.RequestMessage; -import org.teiid.client.ResultsMessage; import org.teiid.client.RequestMessage.StatementType; +import org.teiid.client.ResultsMessage; import org.teiid.client.lob.LobChunk; import org.teiid.client.util.ResultsFuture; import org.teiid.common.buffer.BufferManagerFactory; @@ -54,7 +54,6 @@ import org.teiid.dqp.internal.datamgr.FakeTransactionService; import org.teiid.dqp.internal.process.AbstractWorkItem.ThreadState; import org.teiid.dqp.service.AutoGenDataService; -import org.teiid.dqp.service.BufferService; import org.teiid.dqp.service.FakeBufferService; import org.teiid.query.optimizer.TestOptimizer; import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; Modified: trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/dqp/message/TestResultsMessage.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -79,7 +79,7 @@ message.setWarnings(warnings); return message; } - + @SuppressWarnings("deprecation") public void testSerialize() throws Exception { ResultsMessage message = example(); Modified: trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/mapping/xml/TestMappingLoader.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -248,7 +248,7 @@ assertEquals(1, element.getMinOccurence()); assertEquals(1, element.getMaxOccurence()); - MappingNode node1 = (MappingNode)element.getNodeChildren().get(0); + MappingNode node1 = element.getNodeChildren().get(0); // make sure source's child is mapping element and mapping element's source // is above source @@ -288,17 +288,17 @@ MappingElement element = (MappingElement)node; assertEquals("parentNode", element.getName()); //$NON-NLS-1$ - node = (MappingNode)element.getNodeChildren().get(0); + node = element.getNodeChildren().get(0); assertTrue(node instanceof MappingChoiceNode); MappingChoiceNode choice = (MappingChoiceNode)node; assertTrue(choice.throwExceptionOnDefault()); - node = (MappingNode)choice.getNodeChildren().get(0); + node = choice.getNodeChildren().get(0); assertTrue(node instanceof MappingCriteriaNode); MappingCriteriaNode criteria = (MappingCriteriaNode)node; assertEquals("childNodeCriteria", criteria.getCriteria()); //$NON-NLS-1$ - node = (MappingNode)criteria.getNodeChildren().get(0); + node = criteria.getNodeChildren().get(0); assertTrue(node instanceof MappingElement); element = (MappingElement)node; assertEquals("childNode", element.getName()); //$NON-NLS-1$ @@ -334,17 +334,17 @@ MappingElement element = (MappingElement)node; assertEquals("parentNode", element.getName()); //$NON-NLS-1$ - node = (MappingNode)element.getNodeChildren().get(0); + node = element.getNodeChildren().get(0); assertTrue(node instanceof MappingChoiceNode); MappingChoiceNode choice = (MappingChoiceNode)node; assertTrue(choice.throwExceptionOnDefault()); - node = (MappingNode)choice.getNodeChildren().get(0); + node = choice.getNodeChildren().get(0); assertTrue(node instanceof MappingCriteriaNode); MappingCriteriaNode criteria = (MappingCriteriaNode)node; assertEquals("childNodeCriteria", criteria.getCriteria()); //$NON-NLS-1$ - node = (MappingNode)criteria.getNodeChildren().get(0); + node = criteria.getNodeChildren().get(0); assertTrue(node instanceof MappingElement); element = (MappingElement)node; assertEquals("childNode", element.getName()); //$NON-NLS-1$ @@ -419,7 +419,7 @@ assertFalse(element.isRecursive()); assertEquals("parentNodeSource", element.getSource()); //$NON-NLS-1$ - node = (MappingNode)element.getNodeChildren().get(0); + node = element.getNodeChildren().get(0); assertTrue(node instanceof MappingElement); element = (MappingElement)node; assertEquals("childNode", element.getName()); //$NON-NLS-1$ @@ -431,7 +431,7 @@ assertEquals("ddd", attribute.getDefaultValue()); //$NON-NLS-1$ assertEquals("fff", attribute.getValue()); //$NON-NLS-1$ - node = (MappingNode)element.getNodeChildren().get(0); + node = element.getNodeChildren().get(0); assertTrue(node instanceof MappingRecursiveElement); MappingRecursiveElement recursive = (MappingRecursiveElement)node; assertEquals("recursivenodename", recursive.getName()); //$NON-NLS-1$ @@ -627,7 +627,7 @@ assertEquals("parentSource", element.getSource()); //$NON-NLS-1$ // recursive source - node = (MappingNode)element.getNodeChildren().get(0); + node = element.getNodeChildren().get(0); assertTrue(node instanceof MappingRecursiveElement); MappingRecursiveElement relement = (MappingRecursiveElement)node; Modified: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,12 +22,7 @@ package org.teiid.query.processor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import org.teiid.api.exception.query.ExpressionEvaluationException; import org.teiid.api.exception.query.QueryResolverException; @@ -36,7 +31,6 @@ import org.teiid.core.TeiidComponentException; import org.teiid.events.EventDistributor; import org.teiid.logging.LogManager; -import org.teiid.metadata.MetadataRepository; import org.teiid.query.eval.Evaluator; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataID; Modified: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,18 +22,13 @@ package org.teiid.query.processor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.dqp.internal.datamgr.LanguageBridgeFactory; import org.teiid.events.EventDistributor; -import org.teiid.metadata.MetadataRepository; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.symbol.Expression; Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -457,7 +457,7 @@ BatchCollector collector = processor.createBatchCollector(); TupleBuffer id = collector.collectTuples(); - TestProcessor.examineResults((List[])expected.toArray(new List[expected.size()]), bufferMgr, id); + TestProcessor.examineResults(expected.toArray(new List[expected.size()]), bufferMgr, id); } private BufferManager createCustomBufferMgr(int batchSize) { @@ -556,7 +556,7 @@ dataMgr.registerTuples( metadata, - "CustomerMaster.Customers", (List[])data.toArray(new List[data.size()])); + "CustomerMaster.Customers", data.toArray(new List[data.size()])); } @Test public void testVirtualAccessVirtualDep() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestBatchedUpdateNode.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,7 +22,9 @@ package org.teiid.query.processor.relational; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -37,7 +39,6 @@ import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.events.EventDistributor; -import org.teiid.metadata.MetadataRepository; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.TestBatchedUpdatePlanner; import org.teiid.query.processor.ProcessorDataManager; Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,7 +22,9 @@ package org.teiid.query.processor.relational; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Arrays; @@ -30,15 +32,10 @@ import org.junit.Test; import org.teiid.api.exception.query.ExpressionEvaluationException; -import org.teiid.common.buffer.BlockedException; -import org.teiid.common.buffer.BufferManager; -import org.teiid.common.buffer.BufferManagerFactory; -import org.teiid.common.buffer.TupleBatch; -import org.teiid.common.buffer.TupleSource; +import org.teiid.common.buffer.*; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.events.EventDistributor; -import org.teiid.metadata.MetadataRepository; import org.teiid.query.eval.Evaluator; import org.teiid.query.processor.FakeTupleSource; import org.teiid.query.processor.ProcessorDataManager; Modified: trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/sql/lang/TestSubquerySetCriteria.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -87,13 +87,13 @@ public void testEquals2() { SubquerySetCriteria c1 = example1(); - SubquerySetCriteria c2 = (SubquerySetCriteria)c1.clone(); + SubquerySetCriteria c2 = c1.clone(); assertTrue("Equivalent set criteria should have been equal.", c1.equals(c2)); //$NON-NLS-1$ } public void testEquals3() { SubquerySetCriteria c1 = example1(); - SubquerySetCriteria c2 = (SubquerySetCriteria)c1.clone(); + SubquerySetCriteria c2 = c1.clone(); c2.setNegated(true); assertFalse("Set criteria are not the same", c1.equals(c2)); //$NON-NLS-1$ } Modified: trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/sql/symbol/TestAggregateSymbol.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -32,7 +32,7 @@ import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.Function; - +@SuppressWarnings("nls") public class TestAggregateSymbol extends TestCase { // ################################## FRAMEWORK ################################ Modified: trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/engine/src/test/java/org/teiid/query/sql/visitor/TestExpressionMappingVisitor.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -207,10 +207,10 @@ */ @Test public void testRecursionDetection() { ElementSymbol e1 = new ElementSymbol("g1.e1"); //$NON-NLS-1$ - AggregateSymbol a1 = new AggregateSymbol(NonReserved.SUM, false, e1); //$NON-NLS-1$ + AggregateSymbol a1 = new AggregateSymbol(NonReserved.SUM, false, e1); Function f = new Function(SourceSystemFunctions.ADD_OP, new Expression[] {a1, a1}); HashMap<AggregateSymbol, AggregateSymbol> map = new HashMap<AggregateSymbol, AggregateSymbol>(); - map.put(a1, new AggregateSymbol(NonReserved.SUM, false, a1)); //$NON-NLS-1$ + map.put(a1, new AggregateSymbol(NonReserved.SUM, false, a1)); ExpressionMappingVisitor.mapExpressions(f, map); assertEquals("(SUM(SUM(g1.e1)) + SUM(SUM(g1.e1)))", f.toString()); //$NON-NLS-1$ } Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/jboss-integration/pom.xml 2012-05-24 19:29:03 UTC (rev 4143) @@ -5,7 +5,6 @@ <version>8.1.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> <artifactId>teiid-jboss-integration</artifactId> <name>teiid-jboss-integration</name> <description>JBoss specific integration layer for teiid</description> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/runtime/pom.xml 2012-05-24 19:29:03 UTC (rev 4143) @@ -6,7 +6,6 @@ <version>8.1.0.Alpha1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid</groupId> <artifactId>teiid-runtime</artifactId> <name>Runtime Engine</name> <description>Teiid Runtime Engine</description> Modified: trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,7 +22,6 @@ package org.teiid.cdk.api; -import static org.junit.Assert.assertEquals; import junit.framework.TestCase; import org.teiid.core.util.UnitTestUtil; Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/AbstractMMQueryTestCase.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -23,19 +23,13 @@ package org.teiid.jdbc; -import java.io.File; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.Stack; -import org.teiid.core.util.UnitTestUtil; -import org.teiid.jdbc.TeiidDriver; - /** * This class can be used as the base class to write Query based tests using * the Teiid Driver for integration testing. Just like the scripted one this one should provide all Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -24,15 +24,10 @@ import static org.junit.Assert.*; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLXML; -import java.sql.Statement; -import java.sql.Types; +import java.sql.*; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.teiid.core.util.UnitTestUtil; Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestResultsMetadataWithProvider.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -33,6 +33,7 @@ /** */ +@SuppressWarnings("nls") public class TestResultsMetadataWithProvider extends TestCase { /** Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,7 +22,10 @@ package org.teiid.transport; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.net.InetAddress; @@ -31,22 +34,14 @@ import java.net.UnknownHostException; import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.Properties; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.*; import org.mockito.Mockito; import org.postgresql.Driver; import org.teiid.client.security.ILogon; @@ -55,7 +50,6 @@ import org.teiid.jdbc.FakeServer; import org.teiid.jdbc.TeiidDriver; import org.teiid.jdbc.TestMMDatabaseMetaData; -import org.teiid.jdbc.util.ResultSetUtil; import org.teiid.net.socket.SocketUtil; @SuppressWarnings("nls") Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/pom.xml 2012-05-24 19:29:03 UTC (rev 4143) @@ -29,7 +29,6 @@ <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.1</version> </dependency> <dependency> @@ -76,7 +75,6 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.0</version> </dependency> <dependency> Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ClassFactory.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -33,6 +33,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class ClassFactory { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryReader.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -44,6 +44,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public interface QueryReader { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -21,18 +21,13 @@ */ package org.teiid.test.client; -import java.io.File; -import java.io.IOException; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Properties; -import org.teiid.core.util.FileUtils; -import org.teiid.core.util.PropertiesUtils; import org.teiid.test.client.TestProperties.RESULT_MODES; -import org.teiid.test.framework.ConfigPropertyLoader; import org.teiid.test.framework.TestLogger; import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; @@ -49,6 +44,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public abstract class QueryScenario { protected QueryReader reader = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -58,6 +58,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class TestClient { public static final SimpleDateFormat TSFORMAT = new SimpleDateFormat( Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -38,6 +38,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class TestClientTransaction extends AbstractQueryTransactionTest { private QueryScenario querySet = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestProperties.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -25,6 +25,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class TestProperties { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResult.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -29,6 +29,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public interface TestResult { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -46,6 +46,7 @@ import org.teiid.test.framework.TestLogger; import org.teiid.test.util.StringUtil; +@SuppressWarnings("nls") public class TestResultsSummary { private static final String OVERALL_SUMMARY_FILE = "Summary_totals.txt"; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -42,6 +42,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class TransactionFactory { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -36,6 +36,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class CTCQueryScenario extends QueryScenario { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/ListNestedSortComparator.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -24,11 +24,9 @@ import java.util.List; -import org.teiid.core.util.ArgCheck; - /** * This class can be used for comparing lists of elements, when the fields to * be sorted on and the comparison mechanism are dynamically specified. <p> Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/QueryResults.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -78,6 +78,7 @@ * the query select statement. If no ordering list is specified, the order is the same as results fields are added to this object. * <p> */ +@SuppressWarnings("nls") public class QueryResults implements Externalizable { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -57,7 +57,7 @@ - +@SuppressWarnings("nls") public class XMLExpectedResults implements ExpectedResults { protected Properties props; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -22,24 +22,13 @@ package org.teiid.test.client.ctc; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; +import java.io.*; import java.sql.ResultSet; import java.sql.SQLException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; import java.util.Properties; -import org.jdom.Attribute; -import org.jdom.CDATA; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.JDOMException; +import org.jdom.*; import org.jdom.output.XMLOutputter; import org.junit.Assert; import org.teiid.core.util.FileUtils; @@ -50,7 +39,7 @@ import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.util.TestResultSetUtil; - +@SuppressWarnings("nls") public class XMLGenerateResults implements ResultsGenerator { private static final SimpleDateFormat FILE_NAME_DATE_FORMATER = new SimpleDateFormat( "yyyyMMdd_HHmmss"); //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -42,7 +42,7 @@ import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public class XMLQueryReader implements QueryReader { private Properties props = null; @@ -116,7 +116,6 @@ private List <QueryTest> loadQueries(String querySetID, String queryFileName) throws IOException { - List<QueryTest> queries = null; // Map<String, Object> queries = new HashMap<String, Object>(); File queryFile = new File(queryFileName); if (!queryFile.exists() || !queryFile.canRead()) { @@ -153,7 +152,7 @@ String querySet = queryFileName; List<String> nameParts = StringUtil.split(querySet, "./\\"); //$NON-NLS-1$ if (nameParts.size() > 1) { - querySet = (String) nameParts.get(nameParts.size() - 2); + querySet = nameParts.get(nameParts.size() - 2); } return querySet; } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -26,19 +26,8 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import java.sql.*; +import java.util.*; import org.jdom.Attribute; import org.jdom.Document; @@ -54,7 +43,6 @@ import org.teiid.test.client.QueryTest; import org.teiid.test.client.ctc.QueryResults.ColumnInfo; import org.teiid.test.framework.TestLogger; -import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; import org.teiid.test.util.StringUtil; @@ -69,7 +57,7 @@ * convert the ResultSets into XML. This also helps convert Exceptions into XML * format.</P> */ - +@SuppressWarnings("nls") public class XMLQueryVisitationStrategy { //the row from which we start converting ResultSets to XML Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ExpectedResultsImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -31,13 +31,12 @@ import org.teiid.core.util.SqlUtil; import org.teiid.test.client.ExpectedResults; -import org.teiid.test.client.TestProperties; import org.teiid.test.client.ctc.ResultsHolder; import org.teiid.test.framework.TestLogger; import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.util.TestResultSetUtil; - +@SuppressWarnings("nls") public class ExpectedResultsImpl implements ExpectedResults { private static final int MAX_COL_WIDTH = 65; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -36,6 +36,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class QueryScenarioImpl extends QueryScenario { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -28,8 +28,6 @@ import java.io.PrintStream; import java.sql.ResultSet; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -40,7 +38,7 @@ import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.util.TestResultSetUtil; - +@SuppressWarnings("nls") public class ResultsGeneratorImpl implements ResultsGenerator { private static final SimpleDateFormat FILE_NAME_DATE_FORMATER = new SimpleDateFormat( "yyyyMMdd_HHmmss"); //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/results/TestResultStat.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -30,6 +30,7 @@ * * <p>A per-query set of result stats.</p> */ +@SuppressWarnings("nls") public class TestResultStat implements TestResult, Serializable { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -19,7 +19,7 @@ * @author vanhalbert * */ - +@SuppressWarnings("nls") public class ConfigPropertyLoader { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyNames.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -15,6 +15,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public interface ConfigPropertyNames { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TestLogger.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -32,6 +32,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class TestLogger { public static final Level INFO = Level.INFO; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -7,7 +7,7 @@ import org.teiid.core.util.StringUtil; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public abstract class TransactionContainer { private String testClassName = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -17,7 +17,7 @@ import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public abstract class ConnectionStrategy { private Properties env = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -18,6 +18,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class ConnectionStrategyFactory { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DataSourceConnection.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -19,7 +19,7 @@ import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public class DataSourceConnection extends ConnectionStrategy { public static final String DS_USER = "user"; //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/DriverConnection.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -18,6 +18,7 @@ * The DriverConnection strategy that can get connections in standalone mode or * embedded mode. */ +@SuppressWarnings("nls") public class DriverConnection extends ConnectionStrategy { public static final String DS_USER = "user"; //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/JEEConnection.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -10,7 +10,6 @@ import javax.naming.InitialContext; import javax.sql.DataSource; -import org.teiid.test.framework.datasource.DataSourceFactory; import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; @@ -19,6 +18,7 @@ * server. Make sure all the jndi names are set correctly in the properties * file. */ +@SuppressWarnings("nls") public class JEEConnection extends ConnectionStrategy { public static final String DS_JNDINAME = "ds-jndiname"; //$NON-NLS-1$ Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSource.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -17,6 +17,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class DataSource { public static final String CONNECTOR_TYPE="db.connectortype"; public static final String DB_TYPE="db.type"; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -69,6 +69,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class DataSourceFactory { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -30,6 +30,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class DataSourceMgr { private static DataSourceMgr _instance = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataStore.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -13,6 +13,7 @@ /** * This class loads the data in the databases specified, to a known state */ +@SuppressWarnings("nls") public class DataStore { /** Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -46,6 +46,7 @@ * validate the results of the testcase. * */ +@SuppressWarnings("nls") public abstract class AbstractQueryTransactionTest extends org.teiid.jdbc.AbstractQueryTest implements TransactionQueryTestCase { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -14,7 +14,7 @@ - +@SuppressWarnings("nls") public class JNDITransaction extends TransactionContainer { UserTransaction userTxn = null; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -17,6 +17,7 @@ /** * A transaction which is user controlled. */ +@SuppressWarnings("nls") public class LocalTransaction extends TransactionContainer { public LocalTransaction() { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -13,7 +13,7 @@ import org.teiid.test.framework.TransactionQueryTestCase; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public class XATransaction extends TransactionContainer { private static Random RANDOM = new Random(); private XidImpl xid; Modified: trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -10,7 +10,7 @@ import org.teiid.test.framework.ConfigPropertyLoader; import org.teiid.test.framework.exception.TransactionRuntimeException; - +@SuppressWarnings("nls") public class PropUtils { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/main/java/org/teiid/test/util/TestResultSetUtil.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -51,6 +51,7 @@ * * @since */ +@SuppressWarnings("nls") public class TestResultSetUtil { @@ -60,7 +61,7 @@ private static final String MORE = "$ "; - public static List compareThrowable(Throwable t, String query, File expectedResultsFile, boolean printToConsole) throws IOException, SQLException { + public static List compareThrowable(Throwable t, String query, File expectedResultsFile, boolean printToConsole) throws IOException { BufferedReader expectedResultsReader = null; if (expectedResultsFile != null && expectedResultsFile.exists() && expectedResultsFile.canRead()) { expectedResultsReader = new BufferedReader(new FileReader(expectedResultsFile)); Modified: trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/adminapi/jboss/BaseConnection.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -8,7 +8,7 @@ import org.teiid.jdbc.TeiidDataSource; - +@SuppressWarnings("nls") public class BaseConnection { static String user = "admin"; static String password = "teiid"; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -14,7 +14,7 @@ import org.teiid.test.framework.query.QueryExecution; import org.teiid.test.framework.transaction.TxnAutoTransaction; - +@SuppressWarnings("nls") public class AutoWrapTransactionTests extends CommonTransactionTests { Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -9,11 +9,9 @@ import java.util.concurrent.TimeoutException; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.teiid.jdbc.AbstractQueryTest; import org.teiid.jdbc.TeiidSQLException; -import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; @@ -21,6 +19,7 @@ /** * A common test case among many different transaction stuff. */ +@SuppressWarnings("nls") public abstract class CommonTransactionTests extends BaseAbstractTransactionTestCase { Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -18,6 +18,7 @@ * User Transaction Test is where user handles all the transaction boundaries * so, autocmmit = OFF, and No transaction auto wrapping. */ +@SuppressWarnings("nls") public class LocalTransactionTests extends CommonTransactionTests { Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -14,7 +14,7 @@ import org.teiid.test.framework.query.QueryExecution; import org.teiid.test.framework.transaction.TxnAutoTransaction; - +@SuppressWarnings("nls") public class OffWrapTransactionTests extends BaseAbstractTransactionTestCase { Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -36,6 +36,7 @@ * @author vanhalbert * */ +@SuppressWarnings("nls") public class OnWrapTransactionTests extends CommonTransactionTests { @@ -143,7 +144,7 @@ // force the rollback by trying to insert an invalid row. list.add("insert into pm1.g2 (e1, e2) values(9999,'9999')"); - executeBatch((String[]) list.toArray(new String[list.size()])); + executeBatch(list.toArray(new String[list.size()])); } @Override Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java 2012-05-24 19:25:06 UTC (rev 4142) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/StandaloneGlobalTransactionTests.java 2012-05-24 19:29:03 UTC (rev 4143) @@ -19,6 +19,7 @@ * This is global transaction test to be used when transaction is external * in places like inside app server */ +@SuppressWarnings("nls") public class StandaloneGlobalTransactionTests extends LocalTransactionTests { private static Properties SYS_PROPS;