Author: shawkins Date: 2010-06-10 17:59:07 -0400 (Thu, 10 Jun 2010) New Revision: 2217 Added: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-vdb.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml trunk/metadata/src/test/java/org/teiid/cdk/ trunk/metadata/src/test/java/org/teiid/cdk/api/ trunk/metadata/src/test/java/org/teiid/cdk/unittest/ trunk/metadata/src/test/java/org/teiid/core/ trunk/metadata/src/test/java/org/teiid/core/util/ trunk/metadata/src/test/java/org/teiid/internal/ trunk/metadata/src/test/java/org/teiid/internal/core/ trunk/metadata/src/test/java/org/teiid/internal/core/index/ trunk/runtime/src/test/java/org/teiid/dqp/ trunk/runtime/src/test/java/org/teiid/dqp/service/ trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/ trunk/test-integration/common/src/test/java/org/teiid/cdk/ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/ Removed: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-dynamic-vdb.xml trunk/common-core/src/test/java/com/ trunk/metadata/src/test/java/com/metamatrix/cdk/api/ trunk/metadata/src/test/java/com/metamatrix/cdk/unittest/ trunk/metadata/src/test/java/com/metamatrix/core/util/ trunk/metadata/src/test/java/com/metamatrix/internal/core/index/ trunk/runtime/src/test/java/com/metamatrix/dqp/service/buffer/ trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/ Modified: trunk/api/src/main/java/org/teiid/language/AggregateFunction.java trunk/api/src/main/java/org/teiid/language/Comparison.java trunk/api/src/main/java/org/teiid/language/SetQuery.java trunk/api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java trunk/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java trunk/api/src/test/java/org/teiid/logging/TestLogManager.java trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/README.txt trunk/build/kits/jboss-container/teiid-examples/portfolio/README.txt trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java trunk/common-core/src/main/java/org/teiid/core/util/Assertion.java trunk/common-core/src/test/java/org/teiid/core/id/TestParsingObjectIDs.java trunk/common-core/src/test/java/org/teiid/core/id/TestUUIDFactory.java trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/TickerCollectorVisitor.java trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecution.java trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/translator/yahoo/TestYahooTranslation.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeMetadataFactory.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TranslationHelper.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecution.java trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoobackAsynch.java trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoopbackExecution.java trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Messages.java trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSProcedureExecution.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/ByteLobChunkStream.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/DefaultCapabilitiesFinder.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlannerEnvironment.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java trunk/engine/src/main/java/org/teiid/query/processor/batch/BatchedUpdatePlan.java trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java trunk/engine/src/main/java/org/teiid/query/processor/proc/WhileInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/program/ProgramInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java trunk/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalPlan.java trunk/engine/src/main/java/org/teiid/query/processor/relational/SelectNode.java trunk/engine/src/main/java/org/teiid/query/processor/xml/Condition.java trunk/engine/src/main/java/org/teiid/query/processor/xml/ProcessorInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java trunk/engine/src/main/java/org/teiid/query/resolver/command/BatchedUpdateResolver.java trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java trunk/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java trunk/engine/src/main/java/org/teiid/query/sql/proc/CommandStatement.java trunk/engine/src/main/java/org/teiid/query/sql/proc/LoopStatement.java trunk/engine/src/main/java/org/teiid/query/sql/symbol/ScalarSubquery.java trunk/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java trunk/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java trunk/metadata/src/main/java/org/teiid/internal/core/index/BlocksIndexInput.java trunk/metadata/src/main/java/org/teiid/internal/core/index/Util.java trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java trunk/metadata/src/test/java/org/teiid/cdk/api/ConnectorHost.java trunk/metadata/src/test/java/org/teiid/cdk/api/TranslationUtility.java trunk/metadata/src/test/java/org/teiid/cdk/unittest/FakeTranslationFactory.java trunk/metadata/src/test/java/org/teiid/core/util/TestCharOperation.java trunk/metadata/src/test/java/org/teiid/internal/core/index/TestGammaCompressedIndexBlock.java trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java Log: TEIID-1118 refining the web services calling procedure. cleaning java docs. fixing an issue with the exceptionholder, which wasn't catching exceptions during serialization. adding examples of calling webservices into the kit. Modified: trunk/api/src/main/java/org/teiid/language/AggregateFunction.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/AggregateFunction.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/main/java/org/teiid/language/AggregateFunction.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -80,9 +80,6 @@ return this.expression; } - /** - * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor) - */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); } Modified: trunk/api/src/main/java/org/teiid/language/Comparison.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/Comparison.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/main/java/org/teiid/language/Comparison.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -106,12 +106,8 @@ this.operator = operator; } - /** - * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor) - */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); } - } Modified: trunk/api/src/main/java/org/teiid/language/SetQuery.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/SetQuery.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/main/java/org/teiid/language/SetQuery.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -106,9 +106,6 @@ this.rightQuery = rightQuery; } - /** - * @see org.teiid.language.LanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor) - */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); } Modified: trunk/api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/main/java/org/teiid/language/visitor/DelegatingHierarchyVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -149,9 +149,7 @@ postVisitor.visit(obj); } } - /* - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExistsCriteria) - */ + public void visit(Exists obj) { if (preVisitor != null) { preVisitor.visit(obj); Modified: trunk/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java =================================================================== --- trunk/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -209,9 +209,6 @@ append(condition); } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Delete) - */ public void visit(Delete obj) { buffer.append(DELETE) .append(Tokens.SPACE); @@ -247,9 +244,6 @@ return null; } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.ColumnReference) - */ public void visit(ColumnReference obj) { buffer.append(getElementName(obj, true)); } @@ -308,9 +302,6 @@ return elementName; } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExecute) - */ public void visit(Call obj) { buffer.append(EXEC) .append(Tokens.SPACE); @@ -339,9 +330,6 @@ buffer.append(Tokens.RPAREN); } - /* - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExistsCriteria) - */ public void visit(Exists obj) { buffer.append(EXISTS) .append(Tokens.SPACE) @@ -354,9 +342,6 @@ return infixFunctions.contains(function); } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Function) - */ public void visit(Function obj) { String name = obj.getName(); @@ -448,9 +433,6 @@ return true; } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.GroupBy) - */ public void visit(GroupBy obj) { buffer.append(GROUP) .append(Tokens.SPACE) @@ -459,9 +441,6 @@ append(obj.getElements()); } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.In) - */ public void visit(In obj) { append(obj.getLeftExpression()); if (obj.isNegated()) { @@ -488,9 +467,6 @@ buffer.append(obj.getCorrelationName()); } - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.language.Insert) - */ public void visit(Insert obj) { buffer.append(INSERT).append(Tokens.SPACE); buffer.append(getSourceComment(obj)); Modified: trunk/api/src/test/java/org/teiid/logging/TestLogManager.java =================================================================== --- trunk/api/src/test/java/org/teiid/logging/TestLogManager.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/api/src/test/java/org/teiid/logging/TestLogManager.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -111,9 +111,6 @@ public ListLogger() { } - /* (non-Javadoc) - * @see com.metamatrix.core.log.LogListener#logMessage(org.eclipse.core.runtime.IStatus, long, java.lang.String, java.lang.String) - */ public void log(int level, String context, Object msg){ this.messages.add(msg.toString()); } @@ -122,9 +119,6 @@ this.messages.add(msg.toString()); } - /* (non-Javadoc) - * @see com.metamatrix.core.log.LogListener#shutdown() - */ public void shutdown() { messages.clear(); messages = null; Modified: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/README.txt =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/README.txt 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/README.txt 2010-06-10 21:59:07 UTC (rev 2217) @@ -1,7 +1,7 @@ Follow the same derby setup instructions as the portfolio example. Copy the following files to the <jboss.home>/server/default/deploy directory. - - portfolio-dynamic-vdb.xml + - portfolio-vdb.xml - ../portfolio/marketdata-file-ds.xml - ../portfolio/portfolio-ds.xml Deleted: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-dynamic-vdb.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-dynamic-vdb.xml 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-dynamic-vdb.xml 2010-06-10 21:59:07 UTC (rev 2217) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<vdb name="DynamicPortfolio" version="1"> - - <description>A Dynamic</description> - - <!-- - Setting to use connector supplied metadata. Can be "true" or "cached". - "true" will obtain metadata once for every launch of Teiid. - "cached" will save a file containing the metadata into - the deploy/<vdb name>/<vdb version/META-INF directory - --> - <property name="UseConnectorMetadata" value="cached" /> - - - <!-- - Each model represents a access to one or more sources. - The name of the model will be used as a top level schema name - for all of the metadata imported from the connector. - - NOTE: Multiple model, with different import settings, can be bound to - the same connector binding and will be treated as the same source at - runtime. - --> - <model name="MarketData"> - <!-- - Each source represents a translator and data source. There are - pre-defined translators, or you can create one. ConnectionFactories - or DataSources in JBoss AS they are typically defined using "xxx-ds.xml" files. - --> - <source name="text-connector" translator-name="file" connection-jndi-name="java:marketdata-file"/> - </model> - - <model name="Accounts"> - <!-- - JDBC Import settings - - importer.useFullSchemaName directs the importer to drop the source - schema from the Teiid object name, so that the Teiid fully qualified name - will be in the form of <model name>.<table name> - --> - <property name="importer.useFullSchemaName" value="false"/> - - <!-- - This connector is defined in the "derby-connector-ds.xml" - --> - <source name="derby-connector" translator-name="derby" connection-jndi-name="java:PortfolioDS"/> - </model> - -</vdb> \ No newline at end of file Copied: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-vdb.xml (from rev 2216, trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-dynamic-vdb.xml) =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-vdb.xml (rev 0) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-portfolio/portfolio-vdb.xml 2010-06-10 21:59:07 UTC (rev 2217) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<vdb name="DynamicPortfolio" version="1"> + + <description>A Dynamic VDB</description> + + <!-- + Setting to use connector supplied metadata. Can be "true" or "cached". + "true" will obtain metadata once for every launch of Teiid. + "cached" will save a file containing the metadata into + the deploy/<vdb name>/<vdb version/META-INF directory + --> + <property name="UseConnectorMetadata" value="cached" /> + + + <!-- + Each model represents a access to one or more sources. + The name of the model will be used as a top level schema name + for all of the metadata imported from the connector. + + NOTE: Multiple model, with different import settings, can be bound to + the same connector binding and will be treated as the same source at + runtime. + --> + <model name="MarketData"> + <!-- + Each source represents a translator and data source. There are + pre-defined translators, or you can create one. ConnectionFactories + or DataSources in JBoss AS they are typically defined using "xxx-ds.xml" files. + --> + <source name="text-connector" translator-name="file" connection-jndi-name="java:marketdata-file"/> + </model> + + <model name="Accounts"> + <!-- + JDBC Import settings + + importer.useFullSchemaName directs the importer to drop the source + schema from the Teiid object name, so that the Teiid fully qualified name + will be in the form of <model name>.<table name> + --> + <property name="importer.useFullSchemaName" value="false"/> + + <!-- + This connector is defined in the "derby-connector-ds.xml" + --> + <source name="derby-connector" translator-name="derby" connection-jndi-name="java:PortfolioDS"/> + </model> + +</vdb> \ No newline at end of file Added: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt (rev 0) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt 2010-06-10 21:59:07 UTC (rev 2217) @@ -0,0 +1,40 @@ +Demonstrates how to use the WS Translator to call web services. +See http://www.nws.noaa.gov/forecasts/xml/ for information on the National Weather +Service's SOAP/REST services. + +Copy the following files to the <jboss.home>/server/default/deploy directory. + - weather-vdb.xml + - weather-ds.xml + +Start the JBoss Container + +Use the simple client example run script e.g. + +$./run.sh localhost 31000 weather "some query" + +Example queries: + +1. REST access of the default endpoint augmented by a query string. The query string is +formed with the querystring function, which ensures proper encoding of the +name/value pairs. The invoke procedure has a return parameter, called result that contains +the XML value of the result document. This document is then fed into the XMLTABLE function +to extract row values. Note that the default invocation binding has been set in the vdb xml +to HTTP, which is the proper setting for REST. + +select t.* from + (call weather.invoke(action='GET', + endpoint=querystring('', '38.99,-77.02 39.70,-104.80 47.6,-122.30' as listLatLon, 'time-series' as product, '2004-01-01T00:00:00' as "begin", '2013-04-20T00:00:00' as "end", 'maxt' as maxt, 'mint' as mint) + )) w, XMLTABLE('/dwml/data/location' passing w.result columns "location-key" string, lattitude string path '/point/@latitude', longitude string path '/point/@longitude') t + +2. SOAP11 RPC call overriding all of the parameter values for the invoke procedure. With a SOAP +invocation, the action is used to convey the SOAPAction header value if needed. Also note +the use of the endpoint here with an absolute URL, which will be used instead of the default +on the datasource. + +select xmlserialize(document w.result as string) from (call weather.invoke(action='http://www.weather.gov/forecasts/xml/DWMLgen/w...;, + endpoint='http://www.weather.gov/forecasts/xml/SOAP_server/ndfdXMLser...;, + binding='SOAP11', + request='<ns1:LatLonListZipCode xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns1="http://www.weather.gov/forecasts/xml/DWMLgen/wsdl/ndfdXML... xsi:type="ns2:zipCodeListType" xmlns:ns2="http://www.weather.gov/forecasts/xml/DWMLgen/schema/DWML.... as w + +See the DatabaseMetadata on the invoke procedure for a full description of the parameters. + Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml (rev 0) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml 2010-06-10 21:59:07 UTC (rev 2217) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<connection-factories> + + <no-tx-connection-factory> + <jndi-name>WeatherDS</jndi-name> + <rar-name>connector-ws-7.0.0-SNAPSHOT.rar</rar-name> + <connection-definition>javax.resource.cci.ConnectionFactory</connection-definition> + + <config-property name="EndPoint">http://www.weather.gov/forecasts/xml/sample_... + + <max-pool-size>20</max-pool-size> + + </no-tx-connection-factory> + +</connection-factories> \ No newline at end of file Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml (rev 0) +++ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml 2010-06-10 21:59:07 UTC (rev 2217) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<vdb name="weather" version="1"> + + <!-- + See the dynamicvdb Portfolio example, or http://community.jboss.org/wiki/DynamicVDBinTeiid70 + for more information on the format of a vdb.xml file. + --> + + <description>Shows how to call Web Services</description> + + <property name="UseConnectorMetadata" value="cached" /> + + <model name="Weather"> + <source name="Weather" translator-name="MessageWeather" connection-jndi-name="java:WeatherDS"/> + </model> + + <translator name="MessageWeather" type="ws"> + <property name="DefaultBinding" value="HTTP"/> + </translator> + +</vdb> \ No newline at end of file Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/kits/jboss-container/teiid-examples/portfolio/README.txt =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/portfolio/README.txt 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/build/kits/jboss-container/teiid-examples/portfolio/README.txt 2010-06-10 21:59:07 UTC (rev 2217) @@ -1,3 +1,7 @@ +# +# NOTE: due to changes affecting the text connector. This example is currently not functional. +# + Install a recent version of Derby - see http://db.apache.org/derby/derby_downloads.html Create the example dataset in Derby by running <derby home>/bin/ij customer-schema.sql Modified: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java =================================================================== --- trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -164,13 +164,17 @@ return result; } - private byte[] writeAsByteArray(Throwable t) throws IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(t); - oos.flush(); - oos.close(); - return baos.toByteArray(); + private byte[] writeAsByteArray(Throwable t) { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(t); + oos.flush(); + oos.close(); + return baos.toByteArray(); + } catch (IOException e) { + return null; + } } private Throwable readFromByteArray(byte[] contents) throws IOException { Modified: trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -25,10 +25,13 @@ import org.teiid.client.RequestMessage; /** - * MetaMatrix-specific execution properties. These execution properties can - * be set via the {@link com.metamatrix.jdbc.api.Statement#setExecutionProperty(String, String)} + * These execution properties can + * be set via the {@link TeiidStatement#setExecutionProperty(String, String)} * method. They affect the subsequent execution of all commands on that Statement - * instance. + * instance. + * + * They can also be set using a SET statement via JDBC and take effect for the + * duration of the session. */ public interface ExecutionProperties { Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -220,12 +220,6 @@ return getObjectDirect(column); } - /** - * Get fetch size that will be used if this result set is backed - * by a cursor. This may be the hint fetch size provided by - * {@link com.metamatrix.jdbc.ResultsImpl#getFetchSize} or it may - * have been reset by the server. - */ public int getFetchSize() throws SQLException { return this.fetchSize; } Modified: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java =================================================================== --- trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -44,8 +44,7 @@ /** - * An {@link ObjectInput} which is interoperable with {@link ObjectEncoder} - * and {@link ObjectEncoderOutputStream}. + * An {@link ObjectInput} which is interoperable {@link ObjectEncoderOutputStream}. * * @author The Netty Project (netty-dev(a)lists.jboss.org) * @author Trustin Lee (tlee(a)redhat.com) Modified: trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java =================================================================== --- trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/test/java/org/teiid/client/lob/TestByteLobChunk.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -33,9 +33,6 @@ public class TestByteLobChunk extends TestCase { - /* - * Test method for 'com.metamatrix.common.lob.ByteLobChunk.getBytes()' - */ public void testGetBytes() { String testString = "This is test string for testing ByteLobChunk"; //$NON-NLS-1$ LobChunk chunk = new LobChunk(testString.getBytes(), false); Modified: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java =================================================================== --- trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -1,5 +1,7 @@ package org.teiid.client.util; +import static org.junit.Assert.*; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -9,17 +11,15 @@ import java.sql.SQLException; import java.util.ArrayList; -import junit.framework.TestCase; - import org.junit.Test; -import org.teiid.client.util.ExceptionHolder; +import org.teiid.core.TeiidException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.ReflectionHelper; import org.teiid.core.util.UnitTestUtil; -public class TestExceptionHolder extends TestCase { +public class TestExceptionHolder { //## JDBC4.0-begin ## @SuppressWarnings("all") @@ -95,7 +95,27 @@ Throwable e = holder.getException(); assertTrue(e instanceof TeiidRuntimeException); assertEquals("Unknown Exception", e.getMessage()); //$NON-NLS-1$ - } + } + + private static class NotSerializable { + + } + + @Test public void testDeserializationNotSerializable() throws Exception { + Exception ex = new TeiidException() { + NotSerializable ns = new NotSerializable(); + }; + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(new ExceptionHolder(ex)); + oos.flush(); + + ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())); + ExceptionHolder holder = (ExceptionHolder)ois.readObject(); + Throwable e = holder.getException(); + assertTrue(e instanceof TeiidException); + } //## JDBC4.0-end ## /*## JDBC3.0-JDK1.5-begin ## Modified: trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -225,10 +225,6 @@ return MessageFormat.format(text, parameters); } - /** - * @see com.metamatrix.core.PluginUtil#getStringOrKey(java.lang.String) - * @since 4.1 - */ public String getStringOrKey(final String key) { ArgCheck.isNotNull(key); Modified: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -34,7 +34,6 @@ // /** * The plug-in identifier of this plugin - * (value <code>"com.metamatrix.core"</code>). */ public static final String PLUGIN_ID = CorePlugin.class.getPackage().getName(); Modified: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -225,16 +225,10 @@ return ExceptionUtil.getLinkedMessages(this); } - /* - * @see com.metamatrix.core.util.MetaMatrixNestedException#superPrintStackTrace(java.io.PrintStream) - */ public void superPrintStackTrace(PrintStream output) { super.printStackTrace(output); } - /* - * @see com.metamatrix.core.util.MetaMatrixNestedException#superPrintStackTrace(java.io.PrintWriter) - */ public void superPrintStackTrace(PrintWriter output) { super.printStackTrace(output); } Modified: trunk/common-core/src/main/java/org/teiid/core/util/Assertion.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/util/Assertion.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/main/java/org/teiid/core/util/Assertion.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -45,7 +45,6 @@ * class should no longer be needed and all usage of assertions should be replaced with * use of the built-in JDK assertion facility. * </p> - * @see com.metamatrix.common.util.ArgCheck */ public final class Assertion { //============================================================================================================================ Modified: trunk/common-core/src/test/java/org/teiid/core/id/TestParsingObjectIDs.java =================================================================== --- trunk/common-core/src/test/java/org/teiid/core/id/TestParsingObjectIDs.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/test/java/org/teiid/core/id/TestParsingObjectIDs.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -128,7 +128,7 @@ /** * Ensure that the variant matches the expected variant. * @param uuid the ObjectID - * @param expectedVariant one of the {@link com.metamatrix.common.id.UUID.Variant UUID.Variant} constants. + * @param expectedVariant . */ public static void helpCheckVariant( UUID uuid, int expectedVariant ) { //System.out.println("variant == UUID.Variant.STANDARD ? " + (UUID.getVariant(uuid)==UUID.Variant.STANDARD) ); Modified: trunk/common-core/src/test/java/org/teiid/core/id/TestUUIDFactory.java =================================================================== --- trunk/common-core/src/test/java/org/teiid/core/id/TestUUIDFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/test/java/org/teiid/core/id/TestUUIDFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -116,7 +116,7 @@ /** * Ensure that the variant matches the expected variant. * @param uuid the ObjectID - * @param expectedVariant one of the {@link com.metamatrix.common.id.UUID.Variant UUID.Variant} constants. + * @param expectedVariant */ public static void helpCheckVariant( ObjectID uuid, int expectedVariant ) { if ( UUID.getVariant(uuid) != expectedVariant ) { @@ -127,7 +127,7 @@ /** * Ensure that the version matches the expected version. * @param uuid the ObjectID - * @param expectedVersion one of the {@link com.metamatrix.common.id.UUID.Version UUID.Version} constants. + * @param expectedVersion */ public static void helpCheckVersion( ObjectID uuid, int expectedVersion ) { if ( UUID.getVersion(uuid) != expectedVersion ) { 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 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/common-core/src/test/java/org/teiid/core/util/TestPropertiesUtils.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -71,7 +71,7 @@ /** - * Tests {@link com.metamatrix.common.utils.PropertiesUtils#print(String, Properties, String header)} + * Tests {@link org.teiid.core.util.utils.PropertiesUtils#print(String, Properties, String header)} * and {@link org.teiid.core.util.utils.PropertiesUtils#load(String)} * and {@link org.teiid.core.util.utils.PropertiesUtils#loadHeader(String)} */ Modified: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java =================================================================== --- trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPConnectionImpl.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -146,7 +146,6 @@ /** * Closes LDAP context, effectively closing the connection to LDAP. * (non-Javadoc) - * @see com.metamatrix.connector.pool.PoolAwareConnection#closeSource() */ @Override public void close() { @@ -171,7 +170,6 @@ * * One possible extension is to implement a UnsolicitedNotificationListener. * (non-Javadoc) - * @see com.metamatrix.connector.pool.PoolAwareConnection#isAlive() */ public boolean isAlive() { LogManager.logTrace(LogConstants.CTX_CONNECTOR, "LDAP Connection is alive."); //$NON-NLS-1$ Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/TickerCollectorVisitor.java =================================================================== --- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/TickerCollectorVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/TickerCollectorVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -55,17 +55,11 @@ return this.exception; } - /* - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.ICompareCriteria) - */ public void visit(Comparison obj) { Expression expr = obj.getRightExpression(); addTickerFromExpression(expr); } - /* - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IInCriteria) - */ public void visit(In obj) { List exprs = obj.getRightExpressions(); Iterator iter = exprs.iterator(); Modified: trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecution.java =================================================================== --- trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/sandbox/translator-yahoo/src/main/java/org/teiid/translator/yahoo/YahooExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -81,9 +81,6 @@ this.query = query; } - /* - * @see com.metamatrix.data.SynchQueryExecution#execute(com.metamatrix.data.language.IQuery, int) - */ @Override public void execute() throws TranslatorException { // Log our command @@ -277,17 +274,11 @@ return output; } - /* - * @see com.metamatrix.data.Execution#close() - */ @Override public void close() { // nothing to do } - /* - * @see com.metamatrix.data.Execution#cancel() - */ @Override public void cancel() throws TranslatorException { Modified: trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/translator/yahoo/TestYahooTranslation.java =================================================================== --- trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/translator/yahoo/TestYahooTranslation.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/sandbox/translator-yahoo/src/test/java/org/teiid/translator/yahoo/TestYahooTranslation.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -22,13 +22,13 @@ package org.teiid.translator.yahoo; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.language.Command; import org.teiid.language.Select; import org.teiid.translator.yahoo.YahooExecution; import junit.framework.TestCase; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; public class TestYahooTranslation extends TestCase { Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -35,10 +35,6 @@ */ public class EscapeSyntaxModifier extends FunctionModifier { - /** - * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#translate(org.teiid.language.Function) - * @since 5.0 - */ public List<?> translate(Function function) { List<Object> objs = new ArrayList<Object>(); objs.add("{fn "); //$NON-NLS-1$ Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -121,9 +121,6 @@ return translatedCommand; } - /* - * @see com.metamatrix.data.Execution#close() - */ public synchronized void close() { try { if (statement != null) { @@ -134,9 +131,6 @@ } } - /* - * @see com.metamatrix.data.Execution#cancel() - */ public synchronized void cancel() throws TranslatorException { // if both the DBMS and driver support aborting an SQL try { Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -56,6 +56,7 @@ import org.teiid.language.QueryExpression; import org.teiid.language.SetQuery; import org.teiid.language.Argument.Direction; +import org.teiid.language.SetQuery.Operation; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.metadata.MetadataFactory; @@ -471,7 +472,7 @@ * Gets the database calendar. This will be set to the time zone * specified by the property {@link JDBCPropertyNames#DATABASE_TIME_ZONE}, or * the local time zone if none is specified. - * @return + * @return the database calendar */ public Calendar getDatabaseCalendar() { return CALENDAR.get(); @@ -482,7 +483,7 @@ * if to rely on the default translation. Override with care. * @param command * @param context - * @return + * @return list of translated parts */ public List<?> translate(LanguageObject obj, ExecutionContext context) { List<?> parts = null; @@ -513,7 +514,7 @@ * if to rely on the default translation. * @param command * @param context - * @return + * @return a list of translated parts */ public List<?> translateCommand(Command command, ExecutionContext context) { return null; @@ -524,7 +525,7 @@ * if to rely on the default translation. * @param limit * @param context - * @return + * @return a list of translated parts */ public List<?> translateLimit(Limit limit, ExecutionContext context) { return null; @@ -657,7 +658,7 @@ /** * Set to true to indicate that every branch of a set query * should have parenthesis, i.e. (query) union (query) - * @return + * @return true if parenthesis should be used for each set branch */ public boolean useParensForSetQueries() { return false; @@ -666,26 +667,26 @@ /** * Return false to indicate that time support should be emulated * with timestamps. - * @return + * @return true if database has a time type */ public boolean hasTimeType() { return true; } /** - * Returns the name for a given {@link SetQuery.Operation} + * Returns the name for a given {@link Operation} * @param operation - * @return + * @return the name for the set operation */ public String getSetOperationString(SetQuery.Operation operation) { return operation.toString(); } /** - * Returns the source comment for + * Returns the source comment for the given command * @param context * @param command - * @return + * @return the comment */ public String getSourceComment(ExecutionContext context, Command command) { if (addSourceComment() && context != null) { @@ -698,15 +699,15 @@ * Override to return a name other than the default [group.]element * @param group * @param element - * @return + * @return thre replacement name */ public String replaceElementName(String group, String element) { return null; } /** - * Return the precision of timestamp literals. Defaults to 9 - * @return + * Return the precision of timestamp literals. Defaults to 9. + * @return digits of timestamp nano precision. */ public int getTimestampNanoPrecision() { return 9; @@ -814,7 +815,7 @@ * @param results * @param columnIndex * @param expectedType - * @return + * @return the value * @throws SQLException */ public Object retrieveValue(ResultSet results, int columnIndex, Class<?> expectedType) throws SQLException { @@ -908,7 +909,7 @@ * @param results * @param parameterIndex * @param expectedType - * @return + * @return the value * @throws SQLException */ public Object retrieveValue(CallableStatement results, int parameterIndex, Class expectedType) throws SQLException{ @@ -1041,7 +1042,7 @@ * Create the {@link SQLConversionVisitor} that will perform translation. Typical custom * JDBC connectors will not need to create custom conversion visitors, rather implementors * should override existing {@link JDBCExecutionFactory} methods. - * @return + * @return the {@link SQLConversionVisitor} */ public SQLConversionVisitor getSQLConversionVisitor() { return new SQLConversionVisitor(this); @@ -1050,22 +1051,22 @@ /** * Set to true to indicate that every branch of a join * should have parenthesis. - * @return + * @return true if every branch of a join should use parenthesis */ public boolean useParensForJoins() { return false; } /** - * get the default null ordering - * @return + * Returns the default null ordering + * @return the {@link NullOrder} */ public NullOrder getDefaultNullOrder() { return NullOrder.LOW; } /** - * + * Returns whether the database supports explicit join ordering. * @return true if nulls high|low can be specified */ public boolean supportsExplicitNullOrdering() { @@ -1073,7 +1074,7 @@ } /** - * + * Returns whether the limit clause is applied to the select clause. * @return true if the limit clause is part of the select */ public boolean useSelectLimit() { Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -72,10 +72,6 @@ } } - /** - * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(org.teiid.language.Command[]) - * @since 4.2 - */ public int[] execute(BatchedUpdates batchedCommand) throws TranslatorException { boolean succeeded = false; Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/LocateFunctionModifier.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -105,29 +105,6 @@ * Returns a version of <code>function</code> suitable for executing at the * data source. * <p> - * First, a default function name or the value specified during construction - * of <code>MODFunctionModifier</code> is set on <code>function</code>. - * <p> - * If <code>function</code> represents <code>LOCATE(searchStr, sourceStr, startIndex)</code> - * and <code>startIndex</code> is a literal value, it is translated for - * consistency between the built-in system function - * <code>LOCATE(searchStr, sourceStr, startIndex)</code> and the sources - * implementation. This is done by calling {@link #getStartIndexExpression(Literal)} - * and passing it the literal <code>startIndex</code> value. - * <p> - * If <code>function</code> represents <code>LOCATE(searchStr, sourceStr, startIndex)</code> - * and <code>startIndex</code> is not a literal value, it is translated for - * consistency between the built-in system function - * <code>LOCATE(searchStr, sourceStr, startIndex)</code> and the sources - * implementation. This is done by calling {@link #getStartIndexExpression(Expression)} - * and passing it the non-literal <code>startIndex</code> value. - * <p> - * Finally, <code>function</code>'s parameters may be rearranged depending - * on the value specified by {@link ParameterOrder} during construction of - * <code>MODFunctionModifier</code>. - * <p> - * The translated <code>function</code> is then returned. - * <p> * For example: * <ul> * <code>locate('a', 'abcdefg') ---> LOCATE('a', 'abcdefg')</code><br /> Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -105,7 +105,7 @@ /** * Return List of values to set on a prepared statement, if - * necessary (see {@link #getStatementType}) + * necessary. * @return List of values to be set on a prepared statement */ public List getPreparedValues() { @@ -113,21 +113,16 @@ } /** - * Get String SQL of translated command; but use - * {@link #nextLargeSetQuerySQL} if this command is - * a {@link #isLargeSetQuery large set query} - * @return SQL of translated command, or null if the - * command is a {@link #isLargeSetQuery large set query} + * Get String SQL of translated command. + * @return SQL of translated command */ public String getSql() { return sql; } /** - * Return the statement type, one of {@link #STMT_TYPE_STATEMENT}, - * {@link #STMT_TYPE_PREPARED_STATEMENT}, or - * {@link #STMT_TYPE_CALLABLE_STATEMENT} - * @return statement type of translated command + * Returns whether the statement is prepared. + * @return true if the statement is prepared */ public boolean isPrepared() { return prepared; Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -432,8 +432,6 @@ /** * This is true only after Postgre version 7.1 * However, since version 7 was released in 2000 we'll assume a post 7 instance. - * - * @see org.teiid.translator.jdbc.JDBCCapabilities#supportsInlineViews() */ public boolean supportsInlineViews() { return true; @@ -448,17 +446,11 @@ return true; } - /** - * @see org.teiid.translator.BasicConnectorCapabilities#supportsExcept() - */ @Override public boolean supportsExcept() { return true; } - /** - * @see org.teiid.translator.BasicConnectorCapabilities#supportsIntersect() - */ @Override public boolean supportsIntersect() { return true; Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeMetadataFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeMetadataFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeMetadataFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -26,12 +26,12 @@ import junit.framework.Assert; import org.mockito.Mockito; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.language.Command; import org.teiid.translator.TranslatorException; import org.teiid.translator.ExecutionContext; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; public class FakeMetadataFactory { Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TranslationHelper.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TranslationHelper.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/TranslationHelper.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -30,6 +30,8 @@ import junit.framework.Assert; import org.mockito.Mockito; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.core.TeiidRuntimeException; import org.teiid.language.Command; import org.teiid.query.function.metadata.FunctionMetadataReader; @@ -37,8 +39,6 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.ExecutionContext; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; public class TranslationHelper { Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/TestAccessSQLTranslator.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -25,13 +25,13 @@ import junit.framework.TestCase; import org.mockito.Mockito; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.language.Command; import org.teiid.translator.TranslatorException; import org.teiid.translator.ExecutionContext; import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.TranslatedCommand; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; /** Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/TestDB2SqlTranslator.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,6 +27,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.Command; import org.teiid.translator.TranslatorException; @@ -34,8 +36,6 @@ import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; /** */ Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.teiid.cdk.CommandBuilder; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.UnitTestUtil; import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; @@ -48,7 +49,6 @@ import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; -import com.metamatrix.cdk.api.TranslationUtility; public class TestOracleTranslator { Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -26,6 +26,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.types.DataTypeManager; import org.teiid.language.Command; import org.teiid.metadata.Column; @@ -39,7 +40,6 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.jdbc.TranslationHelper; -import com.metamatrix.cdk.api.TranslationUtility; /** */ Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java =================================================================== --- trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/IQueryToLdapSearchParser.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -86,8 +86,6 @@ /** * Constructor. - * @param logger the connector logger - * @param rm the RuntimeMetadata */ public IQueryToLdapSearchParser(LDAPExecutionFactory factory) { this.executionFactory = factory; Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java =================================================================== --- trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSearchDetails.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -148,7 +148,6 @@ /** * Print Method for Logging - (Detail level logging) - * @param logger the connector logger. */ public void printDetailsToLog() throws NamingException { // Log Search Scope Modified: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java =================================================================== --- trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -120,7 +120,6 @@ * Constructor * @param executionMode the execution mode. * @param ctx the execution context. - * @param rm the runtimeMetadata * @param logger the ConnectorLogger * @param ldapCtx the LDAP Context */ Modified: trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecution.java =================================================================== --- trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -98,9 +98,6 @@ return null; } - /* - * @see com.metamatrix.data.SynchQueryExecution#execute(com.metamatrix.data.language.IQuery, int) - */ @Override public void execute() throws TranslatorException { @@ -143,17 +140,11 @@ return Arrays.asList(new Object[count]); } - /* - * @see com.metamatrix.data.Execution#close() - */ @Override public void close() { // nothing to do } - /* - * @see com.metamatrix.data.Execution#cancel() - */ @Override public void cancel() throws TranslatorException { Modified: trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoobackAsynch.java =================================================================== --- trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoobackAsynch.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoobackAsynch.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -26,10 +26,10 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.ConnectorHost; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.translator.loopback.LoopbackExecutionFactory; -import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; /** Modified: trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoopbackExecution.java =================================================================== --- trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoopbackExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-loopback/src/test/java/org/teiid/translator/loopback/TestLoopbackExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -28,13 +28,13 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.ConnectorHost; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.translator.TranslatorException; import org.teiid.translator.loopback.LoopbackExecution; import org.teiid.translator.loopback.LoopbackExecutionFactory; -import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; public class TestLoopbackExecution extends TestCase { Modified: trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Messages.java =================================================================== --- trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Messages.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Messages.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -23,14 +23,13 @@ package org.teiid.translator.salesforce; import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.teiid.core.BundleUtil; + public class Messages { - private static final String BUNDLE_NAME = "com.metamatrix.connector.salesforce.i18n"; //$NON-NLS-1$ + private static final BundleUtil RESOURCE_BUNDLE = BundleUtil.getBundleUtil(Messages.class); - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - public static String getString(String key) { try { return RESOURCE_BUNDLE.getString(key); Modified: trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java =================================================================== --- trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,6 +27,7 @@ import java.util.List; import org.junit.Test; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.types.DataTypeManager; import org.teiid.language.Select; import org.teiid.metadata.Column; @@ -41,7 +42,6 @@ import org.teiid.translator.salesforce.execution.visitors.JoinQueryVisitor; import org.teiid.translator.salesforce.execution.visitors.SelectVisitor; -import com.metamatrix.cdk.api.TranslationUtility; public class TestVisitors { Modified: trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java =================================================================== --- trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -29,6 +29,8 @@ import javax.resource.cci.ConnectionFactory; import javax.xml.transform.Source; import javax.xml.ws.Service.Mode; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.SOAPBinding; import org.teiid.core.BundleUtil; import org.teiid.language.Call; @@ -50,9 +52,26 @@ @Translator(name="ws") public class WSExecutionFactory extends ExecutionFactory<ConnectionFactory, WSConnection> { + public enum Binding { + HTTP(HTTPBinding.HTTP_BINDING), + SOAP11(SOAPBinding.SOAP11HTTP_BINDING), + SOAP12(SOAPBinding.SOAP12HTTP_BINDING); + + private String bindingId; + + private Binding(String bindingId) { + this.bindingId = bindingId; + } + + public String getBindingId() { + return bindingId; + } + } + public static BundleUtil UTIL = BundleUtil.getBundleUtil(WSExecutionFactory.class); private Mode defaultServiceMode = Mode.PAYLOAD; + private Binding defaultBinding = Binding.SOAP12; private String xmlParamName; @TranslatorProperty(description="Contols request/response message wrapping - set to MESSAGE for full control over SOAP messages.", display="Default Service Mode") @@ -63,7 +82,16 @@ public void setDefaultServiceMode(Mode mode) { this.defaultServiceMode = mode; } + + @TranslatorProperty(description="Contols what SOAP or HTTP type of invocation will be used if none is specified.", display="Default Binding") + public Binding getDefaultBinding() { + return defaultBinding; + } + public void setDefaultBinding(Binding defaultInvocationType) { + this.defaultBinding = defaultInvocationType; + } + public String getXmlParamName() { return xmlParamName; } @@ -92,18 +120,21 @@ WSConnection conn) throws TranslatorException { Procedure p = metadataFactory.addProcedure("invoke"); //$NON-NLS-1$ - //can be one of HTTP, SOAP11, SOAP12 - ProcedureParameter param = metadataFactory.addProcedureParameter("style", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p); //$NON-NLS-1$ + ProcedureParameter param = metadataFactory.addProcedureParameter("binding", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p); //$NON-NLS-1$ + param.setAnnotation("The invocation binding (HTTP, SOAP11, SOAP12). May be set or allowed to default to null to use the default binding."); param.setNullType(NullType.Nullable); param = metadataFactory.addProcedureParameter("action", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p); //$NON-NLS-1$ + param.setAnnotation("With a SOAP invocation, action sets the SOAPAction. With HTTP it sets the HTTP Method (GET, POST, etc.)."); param.setNullType(NullType.Nullable); //can be one of string, xml, clob param = metadataFactory.addProcedureParameter("request", TypeFacility.RUNTIME_NAMES.OBJECT, Type.In, p); //$NON-NLS-1$ + param.setAnnotation("The String, XML, or CLOB value containing an XML document or fragment that represents the request (valid with SOAP or HTTP/POST invocations). If the ExecutionFactory is configured in with a DefaultServiceMode or MESSAGE then SOAP request must contain the entire SOAP message."); param.setNullType(NullType.Nullable); param = metadataFactory.addProcedureParameter("endpoint", TypeFacility.RUNTIME_NAMES.STRING, Type.In, p); //$NON-NLS-1$ + param.setAnnotation("The relative or abolute endpoint to use. May be set or allowed to default to null to use the default endpoint address."); param.setNullType(NullType.Nullable); metadataFactory.addProcedureParameter("result", TypeFacility.RUNTIME_NAMES.XML, Type.ReturnValue, p); //$NON-NLS-1$ Modified: trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSProcedureExecution.java =================================================================== --- trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSProcedureExecution.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSProcedureExecution.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -40,8 +40,6 @@ import javax.xml.ws.Dispatch; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; -import javax.xml.ws.soap.SOAPBinding; import org.teiid.core.types.ClobType; import org.teiid.language.Argument; @@ -56,28 +54,13 @@ import org.teiid.translator.TranslatorException; import org.teiid.translator.WSConnection; import org.teiid.translator.WSConnection.Util; +import org.teiid.translator.ws.WSExecutionFactory.Binding; /** * A soap call executor - handles all styles doc/literal, rpc/encoded etc. */ public class WSProcedureExecution implements ProcedureExecution { - public enum InvocationType { - HTTP(HTTPBinding.HTTP_BINDING), - SOAP11(SOAPBinding.SOAP11HTTP_BINDING), - SOAP12(SOAPBinding.SOAP12HTTP_BINDING); - - private String bindingId; - - private InvocationType(String bindingId) { - this.bindingId = bindingId; - } - - public String getBindingId() { - return bindingId; - } - }; - RuntimeMetadata metadata; ExecutionContext context; private Call procedure; @@ -131,19 +114,19 @@ String endpoint = (String)arguments.get(3).getArgumentValue().getValue(); if (style == null) { - style = InvocationType.SOAP12.getBindingId(); + style = executionFactory.getDefaultBinding().getBindingId(); } else { try { - InvocationType type = InvocationType.valueOf(style.toUpperCase()); + Binding type = Binding.valueOf(style.toUpperCase()); style = type.getBindingId(); } catch (IllegalArgumentException e) { - throw new TranslatorException(WSExecutionFactory.UTIL.getString("invalid_invocation", Arrays.toString(InvocationType.values()))); //$NON-NLS-1$ + throw new TranslatorException(WSExecutionFactory.UTIL.getString("invalid_invocation", Arrays.toString(Binding.values()))); //$NON-NLS-1$ } } Dispatch<Source> dispatch = conn.createDispatch(style, endpoint, Source.class, executionFactory.getDefaultServiceMode()); - if (InvocationType.HTTP.getBindingId().equals(style)) { + if (Binding.HTTP.getBindingId().equals(style)) { if (action == null) { action = "POST"; //$NON-NLS-1$ } @@ -184,6 +167,8 @@ } } catch (SQLException e) { throw new TranslatorException(e); + } catch (WebServiceException e) { + throw new TranslatorException(e); } finally { Util.closeSource(source); } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/ByteLobChunkStream.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/ByteLobChunkStream.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/ByteLobChunkStream.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -45,9 +45,6 @@ this.chunkSize = chunkSize; } - /** - * @see com.metamatrix.common.lob.ByteLobChunkProducer#getNextChunk(int) - */ public LobChunk getNextChunk() throws IOException{ if (this.closed) { @@ -75,9 +72,6 @@ return new LobChunk(cbuf, isLast); } - /** - * @see com.metamatrix.common.lob.ByteLobChunkProducer#close() - */ public void close() throws IOException { this.closed = true; this.stream.close(); Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -415,9 +415,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.dqp.internal.process.DataTierManager#clearCodeTables() - */ public void clearCodeTables() { this.codeTableCache.clearAll(); } Modified: trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -141,9 +141,6 @@ // I N T E R F A C E M E T H O D S //================================================================================== - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementID(java.lang.String) - */ public Object getElementID(final String elementName) throws TeiidComponentException, QueryMetadataException { int columnIndex = elementName.lastIndexOf(TransformationMetadata.DELIMITER_STRING); if (columnIndex == -1) { @@ -159,16 +156,10 @@ throw new QueryMetadataException(elementName+TransformationMetadata.NOT_EXISTS_MESSAGE); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getGroupID(java.lang.String) - */ public Object getGroupID(final String groupName) throws TeiidComponentException, QueryMetadataException { return getMetadataStore().findGroup(groupName.toLowerCase()); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getGroupsForPartialName(java.lang.String) - */ public Collection getGroupsForPartialName(final String partialGroupName) throws TeiidComponentException, QueryMetadataException { ArgCheck.isNotEmpty(partialGroupName); @@ -196,9 +187,6 @@ return filteredResult; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getModelID(java.lang.Object) - */ public Object getModelID(final Object groupOrElementID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(AbstractMetadataRecord.class, groupOrElementID); AbstractMetadataRecord metadataRecord = (AbstractMetadataRecord) groupOrElementID; @@ -216,18 +204,12 @@ throw createInvalidRecordTypeException(groupOrElementID); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getFullName(java.lang.Object) - */ public String getFullName(final Object metadataID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(AbstractMetadataRecord.class, metadataID); AbstractMetadataRecord metadataRecord = (AbstractMetadataRecord) metadataID; return metadataRecord.getFullName(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getFullElementName(java.lang.String, java.lang.String) - */ public String getFullElementName(final String fullGroupName, final String shortElementName) throws TeiidComponentException, QueryMetadataException { ArgCheck.isNotEmpty(fullGroupName); @@ -236,9 +218,6 @@ return fullGroupName + DELIMITER_CHAR + shortElementName; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getShortElementName(java.lang.String) - */ public String getShortElementName(final String fullElementName) throws TeiidComponentException, QueryMetadataException { ArgCheck.isNotEmpty(fullElementName); int index = fullElementName.lastIndexOf(DELIMITER_CHAR); @@ -270,17 +249,11 @@ return null; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementIDsInGroupID(java.lang.Object) - */ public List getElementIDsInGroupID(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table)groupID).getColumns(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getGroupIDForElementID(java.lang.Object) - */ public Object getGroupIDForElementID(final Object elementID) throws TeiidComponentException, QueryMetadataException { if(elementID instanceof Column) { Column columnRecord = (Column) elementID; @@ -293,9 +266,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getStoredProcedureInfoForProcedure(java.lang.String) - */ public StoredProcedureInfo getStoredProcedureInfoForProcedure(final String fullyQualifiedProcedureName) throws TeiidComponentException, QueryMetadataException { ArgCheck.isNotEmpty(fullyQualifiedProcedureName); @@ -393,9 +363,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementType(java.lang.Object) - */ public String getElementType(final Object elementID) throws TeiidComponentException, QueryMetadataException { if(elementID instanceof Column) { return ((Column) elementID).getRuntimeType(); @@ -406,9 +373,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getDefaultValue(java.lang.String) - */ public Object getDefaultValue(final Object elementID) throws TeiidComponentException, QueryMetadataException { if(elementID instanceof Column) { return ((Column) elementID).getDefaultValue(); @@ -439,9 +403,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#isVirtualGroup(java.lang.Object) - */ public boolean isVirtualGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table) groupID).isVirtual(); @@ -467,9 +428,6 @@ return !modelRecord.isPhysical(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getVirtualPlan(java.lang.Object) - */ public QueryNode getVirtualPlan(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -491,9 +449,6 @@ return queryNode; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getInsertPlan(java.lang.Object) - */ public String getInsertPlan(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; @@ -503,9 +458,6 @@ return ((Table)groupID).getInsertPlan(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getUpdatePlan(java.lang.Object) - */ public String getUpdatePlan(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; @@ -515,9 +467,6 @@ return ((Table)groupID).getUpdatePlan(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getDeletePlan(java.lang.Object) - */ public String getDeletePlan(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; @@ -527,9 +476,6 @@ return ((Table)groupID).getDeletePlan(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#modelSupports(java.lang.Object, int) - */ public boolean modelSupports(final Object modelID, final int modelConstant) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Schema.class, modelID); @@ -540,9 +486,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#groupSupports(java.lang.Object, int) - */ public boolean groupSupports(final Object groupID, final int groupConstant) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -556,9 +499,6 @@ } } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#elementSupports(java.lang.Object, int) - */ public boolean elementSupports(final Object elementID, final int elementConstant) throws TeiidComponentException, QueryMetadataException { @@ -631,25 +571,16 @@ return new IllegalArgumentException(DQPPlugin.Util.getString("TransformationMetadata.Invalid_type", elementID.getClass().getName())); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMaxSetSize(java.lang.Object) - */ public int getMaxSetSize(final Object modelID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Schema.class, modelID); return 0; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getIndexesInGroup(java.lang.Object) - */ public Collection getIndexesInGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table)groupID).getIndexes(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getUniqueKeysInGroup(java.lang.Object) - */ public Collection getUniqueKeysInGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -666,18 +597,12 @@ return result; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getForeignKeysInGroup(java.lang.Object) - */ public Collection getForeignKeysInGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table)groupID).getForeignKeys(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getPrimaryKeyIDForForeignKeyID(java.lang.Object) - */ public Object getPrimaryKeyIDForForeignKeyID(final Object foreignKeyID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(ForeignKey.class, foreignKeyID); @@ -685,43 +610,28 @@ return fkRecord.getPrimaryKey(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getAccessPatternsInGroup(java.lang.Object) - */ public Collection getAccessPatternsInGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table)groupID).getAccessPatterns(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementIDsInIndex(java.lang.Object) - */ public List getElementIDsInIndex(final Object index) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(ColumnSet.class, index); return ((ColumnSet)index).getColumns(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementIDsInKey(java.lang.Object) - */ public List getElementIDsInKey(final Object key) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(ColumnSet.class, key); return ((ColumnSet)key).getColumns(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementIDsInAccessPattern(java.lang.Object) - */ public List getElementIDsInAccessPattern(final Object accessPattern) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(ColumnSet.class, accessPattern); return ((ColumnSet)accessPattern).getColumns(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#isXMLGroup(java.lang.Object) - */ public boolean isXMLGroup(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -768,9 +678,6 @@ return null; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMappingNode(java.lang.Object) - */ public MappingNode getMappingNode(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -828,17 +735,11 @@ return Collections.EMPTY_SET; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getCardinality(java.lang.Object) - */ public int getCardinality(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); return ((Table) groupID).getCardinality(); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getXMLSchemas(java.lang.Object) - */ public List<SQLXMLImpl> getXMLSchemas(final Object groupID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(Table.class, groupID); @@ -967,9 +868,6 @@ } } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getExtensionProperties(java.lang.Object) - */ public Properties getExtensionProperties(final Object metadataID) throws TeiidComponentException, QueryMetadataException { ArgCheck.isInstanceOf(AbstractMetadataRecord.class, metadataID); AbstractMetadataRecord metadataRecord = (AbstractMetadataRecord) metadataID; Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -35,7 +35,7 @@ public class QueryPlugin { // extends Plugin { /** - * The plug-in identifier of this plugin (value <code>"com.metamatrix.common"</code>). + * The plug-in identifier of this plugin */ public static final String PLUGIN_ID = QueryPlugin.class.getPackage().getName(); Modified: trunk/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -35,7 +35,6 @@ /** * The plug-in identifier of this plugin - * (value <code>"com.metamatrix.common"</code>). */ public static final String PLUGIN_ID = QueryExecPlugin.class.getPackage().getName(); Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -36,7 +36,7 @@ /** * This method requests that the source return all - * {@link com.metamatrix.query.function.FunctionMethod}s + * {@link FunctionMethod}s * the source knows about. This can occur in several situations - * on initial registration with the FunctionLibraryManager, on a * general reload, etc. This may be called multiple times and should Modified: trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/metadata/BasicQueryMetadata.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -152,16 +152,10 @@ return null; } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMaximumValue(java.lang.Object) - */ public Object getMaximumValue(Object elementID) throws TeiidComponentException, QueryMetadataException { return null; } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMinimumValue(java.lang.Object) - */ public Object getMinimumValue(Object elementID) throws TeiidComponentException, QueryMetadataException { return null; } @@ -420,30 +414,18 @@ return QueryMetadataInterface.UNKNOWN_CARDINALITY; } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getXMLSchemas(java.lang.Object) - */ public List getXMLSchemas(Object groupID) throws TeiidComponentException, QueryMetadataException { return null; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getNameInSource(java.lang.Object) - */ public String getNameInSource(Object metadataID) throws TeiidComponentException, QueryMetadataException { return null; } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementLength(java.lang.Object) - */ public int getElementLength(Object elementID) throws TeiidComponentException, QueryMetadataException { return 0; } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getExtensionProperties(java.lang.Object) - */ public Properties getExtensionProperties(Object metadataID) throws TeiidComponentException, QueryMetadataException { return null; Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -195,9 +195,6 @@ return this.actualMetadata.getDefaultValue(elementID); } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMaximumValue(java.lang.Object) - */ public Object getMaximumValue(Object elementID) throws TeiidComponentException, QueryMetadataException { if (elementID instanceof TempMetadataID) { TempMetadataID id = (TempMetadataID)elementID; @@ -209,9 +206,6 @@ return this.actualMetadata.getMaximumValue(elementID); } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getMinimumValue(java.lang.Object) - */ public Object getMinimumValue(Object elementID) throws TeiidComponentException, QueryMetadataException { if (elementID instanceof TempMetadataID) { TempMetadataID id = (TempMetadataID)elementID; @@ -488,9 +482,6 @@ return this.actualMetadata.getCardinality(groupID); } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getXMLSchemas(java.lang.Object) - */ public List getXMLSchemas(Object groupID) throws TeiidComponentException, QueryMetadataException { if(groupID instanceof TempMetadataID) { return Collections.EMPTY_LIST; @@ -498,9 +489,6 @@ return this.actualMetadata.getXMLSchemas(groupID); } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getExtensionProperties(java.lang.Object) - */ public Properties getExtensionProperties(Object metadataID) throws TeiidComponentException, QueryMetadataException { @@ -510,9 +498,6 @@ return actualMetadata.getExtensionProperties(metadataID); } - /* (non-Javadoc) - * @see com.metamatrix.query.metadata.QueryMetadataInterface#getElementLength(java.lang.Object) - */ public int getElementLength(Object elementID) throws TeiidComponentException, QueryMetadataException { if (elementID instanceof TempMetadataID) { TempMetadataID id = (TempMetadataID)elementID; @@ -592,9 +577,6 @@ return actualMetadata.getNativeType(elementID); } - /* - * @see com.metamatrix.query.metadata.QueryMetadataInterface#isProcedureInputElement(java.lang.Object) - */ public boolean isProcedure(Object elementID) throws TeiidComponentException, QueryMetadataException { if(elementID instanceof TempMetadataID) { Object oid = ((TempMetadataID) elementID).getOriginalMetadataID(); Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/DefaultCapabilitiesFinder.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/DefaultCapabilitiesFinder.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/DefaultCapabilitiesFinder.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -40,9 +40,6 @@ this.capabilities = capabilities; } - /* (non-Javadoc) - * @see com.metamatrix.query.optimizer.capabilities.CapabilitiesFinder#findCapabilities(java.lang.Object) - */ public SourceCapabilities findCapabilities(String modelName) throws TeiidComponentException { return capabilities; } Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -124,9 +124,6 @@ private PlanHints hints = new PlanHints(); private Option option; - /** - * @see org.teiid.query.optimizer.CommandPlanner#optimize(com.metamatrix.query.optimizer.CommandTreeNode, java.util.Map, org.teiid.query.metadata.QueryMetadataInterface, boolean) - */ public ProcessorPlan optimize( Command command, IDGenerator idGenerator, Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -54,9 +54,7 @@ public final class RuleAccessPatternValidation implements OptimizerRule { /** - * Verifies * @throws QueryPlannerException if an access pattern has not been satisfied - * @see com.metamatrix.query.optimizer.OptimizerRule#execute(PlanNode, QueryMetadataInterface, RuleStack) */ public PlanNode execute( PlanNode plan, Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -55,7 +55,6 @@ * Verifies that a model with "supports where all" is being passed an atomic * query with a criteria. * @throws QueryPlannerException if property is not satisfied - * @see com.metamatrix.query.optimizer.OptimizerRule#execute(PlanNode, QueryMetadataInterface, RuleStack) */ public PlanNode execute( PlanNode plan, Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlannerEnvironment.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlannerEnvironment.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlannerEnvironment.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -57,7 +57,6 @@ * {@link ProcessorEnvironment#STRING_RESULT} or * {@link ProcessorEnvironment#JDOM_DOCUMENT_RESULT} or * This is to be used in conjunction with - * {@link com.metamatrix.query.optimizer.CommandTreeNode CommandTreeNode} * property methods. */ public static final Integer XML_FORM_RESULTS_PROPERTY = new Integer(0); Modified: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -154,9 +154,6 @@ return transactionalReads; } - /** - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { PlanNode props = new PlanNode(this.getClass().getSimpleName()); props.addProperty(PROP_OUTPUT_COLS, AnalysisRecord.getOutputColumnProperties(getOutputElements())); Modified: trunk/engine/src/main/java/org/teiid/query/processor/batch/BatchedUpdatePlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/batch/BatchedUpdatePlan.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/batch/BatchedUpdatePlan.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -201,10 +201,6 @@ commandIndex = 0; } - /** - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - * @since 4.2 - */ public PlanNode getDescriptionProperties() { PlanNode props = super.getDescriptionProperties(); for (int i = 0; i < getPlanCount(); i++) { Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -90,9 +90,6 @@ return props; } - /** - * @see org.teiid.query.processor.proc.RepeatedInstruction#testCondition(com.metamatrix.query.processor.proc.ProcedureEnvironment) - */ public boolean testCondition(ProcedurePlan procEnv) throws TeiidComponentException, TeiidProcessingException { if(!procEnv.resultSetExists(rsName)) { procEnv.executePlan(plan, rsName); @@ -108,9 +105,6 @@ return loopProgram; } - /** - * @see org.teiid.query.processor.proc.RepeatedInstruction#postInstruction(com.metamatrix.query.processor.proc.ProcedureEnvironment) - */ public void postInstruction(ProcedurePlan procEnv) throws TeiidComponentException { procEnv.removeResults(rsName); } Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -447,7 +447,6 @@ /** * @throws TeiidComponentException - * @see com.metamatrix.query.processor.program.ProgramEnvironment#pop() */ public void pop() throws TeiidComponentException { Program program = this.programs.pop(); @@ -468,9 +467,6 @@ this.tempContext.removeLast(); } - /** - * @see com.metamatrix.query.processor.program.ProgramEnvironment#push(org.teiid.query.processor.program.Program) - */ public void push(Program program) { program.resetProgramCounter(); this.programs.push(program); @@ -486,9 +482,6 @@ this.tempContext.add(new HashSet()); } - /** - * @see com.metamatrix.query.processor.program.ProgramEnvironment#incrementProgramCounter() - */ public void incrementProgramCounter() throws TeiidComponentException { Program program = peek(); ProgramInstruction instr = program.getCurrentInstruction(); Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/WhileInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/WhileInstruction.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/WhileInstruction.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -76,7 +76,6 @@ /** * @throws TeiidProcessingException - * @see org.teiid.query.processor.proc.RepeatedInstruction#testCondition(com.metamatrix.query.processor.proc.ProcedureEnvironment) */ public boolean testCondition(ProcedurePlan procEnv) throws TeiidComponentException, TeiidProcessingException { return procEnv.evaluateCriteria(condition); @@ -89,9 +88,6 @@ return whileProgram; } - /** - * @see org.teiid.query.processor.proc.RepeatedInstruction#postInstruction(com.metamatrix.query.processor.proc.ProcedureEnvironment) - */ public void postInstruction(ProcedurePlan procEnv) throws TeiidComponentException { } Modified: trunk/engine/src/main/java/org/teiid/query/processor/program/ProgramInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/program/ProgramInstruction.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/program/ProgramInstruction.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -48,8 +48,7 @@ /** * Allow this instruction to do whatever processing it needs, and to - * in turn manipulate the running program, (via the ProcessorEnvironment - * {@link ProgramEnvironment#getProgramStack getProgramStack} method.) A typical instruction should simply {@link + * in turn manipulate the running program. A typical instruction should simply {@link * Program#incrementProgramCounter increment} the program counter of the current program, but specialized * instructions may add sub programs to the stack or not increment the counter (so that they are executed again.) */ Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -215,9 +215,6 @@ target.command = source.command; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { PlanNode props = super.getDescriptionProperties(); props.addProperty(PROP_SQL, this.command.toString()); Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -441,9 +441,6 @@ return clonedNode; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { // Default implementation - should be overridden PlanNode props = super.getDescriptionProperties(); Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -254,9 +254,6 @@ target.selectSymbols = this.selectSymbols; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { PlanNode props = super.getDescriptionProperties(); AnalysisRecord.addLanaguageObjects(props, PROP_SELECT_COLS, this.selectSymbols); Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalPlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalPlan.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/RelationalPlan.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -131,9 +131,6 @@ return plan; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { return this.root.getDescriptionProperties(); } Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/SelectNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/SelectNode.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/SelectNode.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -150,9 +150,6 @@ target.projectionIndexes = source.projectionIndexes; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { PlanNode props = super.getDescriptionProperties(); AnalysisRecord.addLanaguageObjects(props, PROP_CRITERIA, Arrays.asList(this.criteria)); Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/Condition.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/Condition.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/Condition.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -28,7 +28,6 @@ /** * This is a condition which can be evaluated, and which supplies a * Program instance which should act as the resulting sub Program to be run - * (placed on the top of the {@link ProcessorEnvironment#getProgramStack program stack}) * if the condition evaluates to true. */ public abstract class Condition { @@ -41,9 +40,7 @@ /** * If this Condition {@link #evaluate evaluates} to true, this Program should - * be retrieved and placed at the top of the - * {@link ProcessorEnvironment#getProgramStack program stack}, to be run - * immediately. + * be retrieved to be run immediately. * @return Program sub Program to be run if this Condition evaluates to true */ public Program getThenProgram() { @@ -63,7 +60,7 @@ * @param elementMap Map of elements to their index in the currentRowData * @param currentRowData List of Objects representing the current row of * the result set(s) - * @param env ProcessorEnvironment of the XMLPlan, maintains state of the running + * @param env XMLProcessorEnvironment of the XMLPlan, maintains state of the running * XML Processor Plan */ public abstract boolean evaluate(XMLProcessorEnvironment env, XMLContext ontext) Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/ProcessorInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/ProcessorInstruction.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/ProcessorInstruction.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -38,8 +38,7 @@ /** * Allow this ProcessorInstruction to do whatever processing it needs, and to - * in turn manipulate the running program, (via the ProcessorEnvironment - * {@link ProcessorEnvironment#getProgramStack getProgramStack} method.) + * in turn manipulate the running program. * A typical instruction should simply {@link Program#incrementProgramCounter increment} * the program counter of the current program, but specialized instructions may add * sub programs to the stack or not increment the counter (so that they are Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -458,9 +458,6 @@ return xmlPlan; } - /* - * @see com.metamatrix.query.processor.Describable#getDescriptionProperties() - */ public PlanNode getDescriptionProperties() { PlanNode node = this.originalProgram.getDescriptionProperties(); node.addProperty(PROP_OUTPUT_COLS, AnalysisRecord.getOutputColumnProperties(getOutputElements())); Modified: trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -96,9 +96,6 @@ } } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getCurrentProgram() - */ public Program getCurrentProgram() { // jh case 5266 if ( this.programStack.size() > 0 ) { @@ -124,9 +121,6 @@ return (programState.recursionCount > ProgramState.NOT_RECURSIVE); } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#incrementCurrentProgramCounter() - */ public void incrementCurrentProgramCounter() { ProgramState programState = this.programStack.getFirst(); programState.programCounter++; @@ -142,9 +136,6 @@ } } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#pushProgram(Program) - */ public void pushProgram(Program program) { pushProgram(program, false); } @@ -168,9 +159,6 @@ this.programStack.addFirst(programState); } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getCurrentInstruction() - */ public ProcessorInstruction getCurrentInstruction() { ProgramState programState = this.programStack.getFirst(); @@ -189,9 +177,6 @@ return programState.program.getInstructionAt(programState.programCounter); } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getProgramRecursionCount(Program) - */ public int getProgramRecursionCount(Program program){ ProgramState programState = getProgramState(program); @@ -229,52 +214,30 @@ return new RelationalPlanExecutor(clone, this.commandContext, this.dataMgr, this.bufferMgr); } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getDocumentInProgress() - */ public DocumentInProgress getDocumentInProgress() { return this.documentInProgress; } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#setDocumentInProgress(DocumentInProgress) - */ public void setDocumentInProgress(DocumentInProgress documentInProgress) { this.documentInProgress = documentInProgress; } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getXMLFormat - */ public String getXMLFormat() { return this.xmlFormat; } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#setXMLFormat - */ public void setXMLFormat(String xmlFormat) { this.xmlFormat = xmlFormat; } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getDataManager() - */ public ProcessorDataManager getDataManager() { return this.dataMgr; } - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#getProcessorContext() - */ public CommandContext getProcessorContext() { return this.commandContext; } - - /** - * @see com.metamatrix.query.processor.xml.ProcessorEnvironment#clone() - */ public Object clone() { XMLProcessorEnvironment clone = new XMLProcessorEnvironment(); copyIntoClone(clone); Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/BatchedUpdateResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/BatchedUpdateResolver.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/BatchedUpdateResolver.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -42,9 +42,6 @@ */ public class BatchedUpdateResolver implements CommandResolver { - /** - * @see com.metamatrix.query.resolver.command.AbstractCommandResolver#resolveCommand(org.teiid.query.sql.lang.Command, boolean, org.teiid.query.analysis.AnalysisRecord, boolean) - */ public void resolveCommand(Command command, TempMetadataAdapter metadata, AnalysisRecord analysis, boolean resolveNullLiterals) throws QueryMetadataException, QueryResolverException, TeiidComponentException { Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -65,9 +65,6 @@ return null; } - /** - * @see com.metamatrix.query.sql.lang.SubqueryCriteria#getCommand() - */ public Command getCommand() { return this.command; } Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -122,9 +122,6 @@ this.predicateQuantifier = predicateQuantifier; } - /** - * @see com.metamatrix.query.sql.lang.SubqueryCriteria#getCommand() - */ public Command getCommand() { return this.command; } Modified: trunk/engine/src/main/java/org/teiid/query/sql/proc/CommandStatement.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/proc/CommandStatement.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/proc/CommandStatement.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -62,10 +62,6 @@ return command; } - /** - * Sets the command. - * @see com.metamatrix.query.sql.lang.SubqueryLanguageObject#setCommand() - */ public void setCommand(Command command){ this.command = command; } Modified: trunk/engine/src/main/java/org/teiid/query/sql/proc/LoopStatement.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/proc/LoopStatement.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/proc/LoopStatement.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -72,7 +72,6 @@ /** * Sets the command. - * @see com.metamatrix.query.sql.lang.SubqueryLanguageObject#setCommand() */ public void setCommand(Command command){ this.query = command; Modified: trunk/engine/src/main/java/org/teiid/query/sql/symbol/ScalarSubquery.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/symbol/ScalarSubquery.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/symbol/ScalarSubquery.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -95,9 +95,6 @@ this.type = type; } - /** - * @see com.metamatrix.query.sql.lang.SubqueryLanguageObject#getCommand() - */ public Command getCommand() { return this.command; } @@ -105,7 +102,6 @@ /** * Sets the command. Also modifies the hash code of this object, so * caution should be used in using this method. - * @see com.metamatrix.query.sql.lang.SubqueryLanguageObject#setCommand() */ public void setCommand(Command command){ this.command = command; Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -70,16 +70,10 @@ this.commands.add(obj.getCommand()); } - /** - * @see org.teiid.query.sql.LanguageVisitor#visit(com.metamatrix.query.sql.lang.ScalarSubquery) - */ public void visit(ScalarSubquery obj) { this.commands.add(obj.getCommand()); } - /** - * @see org.teiid.query.sql.LanguageVisitor#visit(org.teiid.query.sql.lang.SubqueryCompareCriteria) - */ public void visit(SubqueryCompareCriteria obj) { this.commands.add(obj.getCommand()); } Modified: trunk/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -40,8 +40,7 @@ /** * <p>This visitor class will traverse a language object tree and collect all language - * objects that implement {@link com.metamatrix.sql.util.ValueIteratorProvider. These - * all currently also implement {@link com.metamatrix.sql.lang.SubqueryContainer}. + * objects that implement {@link SubqueryContainer}. * By default it uses a java.util.ArrayList to collect the objects in the order * they're found.</p> * @@ -73,7 +72,7 @@ /** * Get the value iterator providers collected by the visitor. This should best be called * after the visitor has been run on the language object tree. - * @return Collection of {@link com.metamatrix.sql.util.ValueIteratorProvider} + * @return Collection of {@link SubqueryContainer} * (by default, this is a java.util.ArrayList) */ public List<SubqueryContainer> getValueIteratorProviders() { Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -1257,6 +1257,9 @@ if (item.getPrefix().equals("xml") || item.getPrefix().equals("xmlns")) { //$NON-NLS-1$ //$NON-NLS-2$ handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.xml_namespaces_reserved"), obj); //$NON-NLS-1$ } + if (item.getUri().length() == 0) { + handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.xml_namespaces_null_uri"), obj); //$NON-NLS-1$ + } continue; } if (hasDefault) { Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-06-10 21:59:07 UTC (rev 2217) @@ -895,6 +895,7 @@ ValidationVisitor.text_table_newline=Text table DELIMITER, QUOTE, and ESCAPE characters cannot be the new line character. ValidationVisitor.xml_namespaces=At most only one NO DEFAULT or DEFAULT namespace may be specified. ValidationVisitor.xml_namespaces_reserved=The namespaces xmlns and xml are reserved. +ValidationVisitor.xml_namespaces_null_uri=The null uri, or empty string, is not allowed as the uri value. ValidationVisitor.xml_attributes_reserved=The namespace xmlns is reserved. ValidationVisitor.xml_invalid_qname=The qname "{0}" is invalid. ValidationVisitor.context_item_type=XMLTABLE or XMLQUERY PASSING context item must be an XML value. Modified: trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -29,25 +29,16 @@ import org.teiid.dqp.internal.cache.DQPContextCache; import org.teiid.dqp.service.BufferService; - -/** - */ public class FakeBufferService implements BufferService { private BufferManager bufferMgr; - /** - * - */ public FakeBufferService() { super(); bufferMgr = BufferManagerFactory.getStandaloneBufferManager(); } - /* - * @see com.metamatrix.dqp.service.BufferService#getBufferManager() - */ public BufferManager getBufferManager() { return bufferMgr; } Modified: trunk/metadata/src/main/java/org/teiid/internal/core/index/BlocksIndexInput.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/internal/core/index/BlocksIndexInput.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/metadata/src/main/java/org/teiid/internal/core/index/BlocksIndexInput.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -21,6 +21,7 @@ import org.teiid.core.index.IEntryResult; import org.teiid.core.index.IQueryResult; import org.teiid.core.util.LRUCache; +import org.teiid.metadata.index.RuntimeMetadataPlugin; /** @@ -218,7 +219,7 @@ raf= vraf.getSafeRandomAccessFile(); String sig= raf.readUTF(); if (!sig.equals(IIndexConstants.SIGNATURE)) - throw new IOException(Util.bind("exception.wrongFormat")); //$NON-NLS-1$ + throw new IOException(RuntimeMetadataPlugin.Util.getString("exception.wrongFormat")); //$NON-NLS-1$ int summaryBlockNum= raf.readInt(); raf.seek(summaryBlockNum * (long) IIndexConstants.BLOCK_SIZE); summary= new IndexSummary(); Modified: trunk/metadata/src/main/java/org/teiid/internal/core/index/Util.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/internal/core/index/Util.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/metadata/src/main/java/org/teiid/internal/core/index/Util.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -11,43 +11,12 @@ *******************************************************************************/ package org.teiid.internal.core.index; -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; public class Util { private Util() { } - /* Bundle containing messages */ - protected static ResourceBundle bundle; - private final static String bundleName = "com.metamatrix.core.index.i18n"; //$NON-NLS-1$ - - /** - * Lookup the message with the given ID in this catalog - */ - public static String bind(String id) { - return bind(id, (String[]) null); - } - /** - * Lookup the message with the given ID in this catalog and bind its - * substitution locations with the given string values. - */ - public static String bind(String id, String[] arguments) { - if (id == null) - return "No message available"; //$NON-NLS-1$ - String message = null; - try { - message = bundle.getString(id); - } catch (MissingResourceException e) { - // If we got an exception looking for the message, fail gracefully by just returning - // the id we were looking for. In most cases this is semi-informative so is not too bad. - return "Missing message: " + id + " in: " + bundleName; //$NON-NLS-2$ //$NON-NLS-1$ - } - return MessageFormat.format(message, (Object[])arguments); - } - /** * Compares two strings lexicographically. * The comparison is based on the Unicode value of each character in Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -63,25 +63,22 @@ /** * The version number that is associated with the change made to change the list - * delimiter from {@link com.metamatrix.modeler.core.index.IndexConstants.LIST_DELIMITER_OLD} - * to {@link com.metamatrix.modeler.core.index.IndexConstants.LIST_DELIMITER} and also the - * property delimiter was changed from {@link com.metamatrix.modeler.core.index.IndexConstants.PROP_DELIMITER_OLD} - * to {@link com.metamatrix.modeler.core.index.IndexConstants.PROP_DELIMITER}. Added 07/22/2004. - * @release 4.1.1 + * delimiter. Added 07/22/2004. + * @since 4.1.1 */ public static final int DELIMITER_INDEX_VERSION = 1; /** * The version number that is associated with the change made to add materialization * property on tables. Added 08/18/2004. - * @release 4.2 + * @since 4.2 */ public static final int TABLE_MATERIALIZATION_INDEX_VERSION = 2; /** * The version number that is associated with the change made to add native type * property on columns. Added 08/24/2004. - * @release 4.2 + * @since 4.2 */ public static final int COLUMN_NATIVE_TYPE_INDEX_VERSION = 3; @@ -90,7 +87,7 @@ * flag on columns. The flag is used to indicate if an element for a virtual table * represents an input parameter. This change was made to support the Procedural-Relational * Mapping project. Added 09/29/2004. - * @release 4.2 + * @since 4.2 */ public static final int COLUMN_INPUT_PARAMETER_FLAG_INDEX_VERSION = 4; @@ -98,7 +95,7 @@ * The version number that is associated with the change made to remove property value * pairs from the annotation records any properties on annotations would now be indexed * as part of the properties index. Added 12/14/2004. - * @release 4.2 + * @since 4.2 */ public static final int ANNOTATION_TAGS_INDEX_VERSION = 5; @@ -106,28 +103,28 @@ * The version number that is associated with the change made to add uuid for the * transformation mapping root on the transformation records, uuids would now be indexed * as part of the transformation index. Added 1/13/2005. - * @release 4.2 + * @since 4.2 */ public static final int TRANSFORMATION_UUID_INDEX_VERSION = 6; /** * The version number that is associated with the change made to add count of null and * distinct values for columns on the column records 7/8/2005. - * @release 4.2 + * @since 4.2 */ public static final int COLUMN_NULL_DISTINCT_INDEX_VERSION = 7; /** * The version number that is associated with the change made to add * primitive type ID on datatype records 02/28/2006. - * @release 5.0 + * @since 5.0 */ public static final int PRIMITIVE_TYPE_ID_INDEX_VERSION = 8; /** * The version number that is associated with the change made to add * an update count to physical stored and XQuery procedures 04/29/2008. - * @release 5.0 + * @since 5.0 */ public static final int PROCEDURE_UPDATE_COUNT_VERSION = 9; @@ -139,9 +136,8 @@ private int version = NONVERSIONED_RECORD_INDEX_VERSION; /** - * Return a collection of {@link com.metamatrix.modeler.core.metadata.runtime.MetadataRecord} + * Return a collection of {@link AbstractMetadataRecord} * instances for the result obtained from executing <code>queryEntriesMatching</code> - * method on the {@link com.metamatrix.internal.core.index.impl.Index} * @param queryResult * @param container Container reference to be set on the record */ @@ -157,7 +153,7 @@ } /** - * Return the {@link com.metamatrix.modeler.core.metadata.runtime.MetadataRecord} + * Return the {@link AbstractMetadataRecord} * instances for specified IEntryResult. * @param entryResult */ Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/RuntimeMetadataPlugin.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -36,7 +36,6 @@ /** * The plug-in identifier of this plugin - * (value <code>"com.metamatrix.metadata.runtime"</code>). */ public static final String PLUGIN_ID = "org.teiid.metadata"; //$NON-NLS-1$ Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java =================================================================== --- trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/metadata/src/main/java/org/teiid/metadata/index/TransformationRecordImpl.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -46,37 +46,22 @@ private List schemaPaths; private String resourcePath; - /** - * @see com.metamatrix.modeler.core.metadata.runtime.TransformationRecord#getTransformation() - */ public String getTransformation() { return transformation; } - /* - * @see com.metamatrix.modeler.core.metadata.runtime.TransformationRecord#getBindings() - */ public List getBindings() { return this.bindings; } - /* - * @see com.metamatrix.modeler.core.metadata.runtime.TransformationRecord#getSchemaPaths() - */ public List getSchemaPaths() { return schemaPaths; } - /* - * @see com.metamatrix.modeler.core.metadata.runtime.TransformationRecord#getTransformationType() - */ public String getTransformationType() { return transformationType; } - /** - * @see com.metamatrix.modeler.core.metadata.runtime.TransformationRecord#getType() - */ public String getType() { return this.transformationType; } Copied: trunk/metadata/src/test/java/org/teiid/cdk/api (from rev 2211, trunk/metadata/src/test/java/com/metamatrix/cdk/api) Modified: trunk/metadata/src/test/java/org/teiid/cdk/api/ConnectorHost.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/cdk/api/ConnectorHost.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/metadata/src/test/java/org/teiid/cdk/api/ConnectorHost.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.cdk.api; +package org.teiid.cdk.api; import java.util.ArrayList; import java.util.Arrays; Modified: trunk/metadata/src/test/java/org/teiid/cdk/api/TranslationUtility.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/cdk/api/TranslationUtility.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/metadata/src/test/java/org/teiid/cdk/api/TranslationUtility.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.cdk.api; +package org.teiid.cdk.api; import java.io.IOException; import java.net.URL; Copied: trunk/metadata/src/test/java/org/teiid/cdk/unittest (from rev 2211, trunk/metadata/src/test/java/com/metamatrix/cdk/unittest) Modified: trunk/metadata/src/test/java/org/teiid/cdk/unittest/FakeTranslationFactory.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/cdk/unittest/FakeTranslationFactory.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/metadata/src/test/java/org/teiid/cdk/unittest/FakeTranslationFactory.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,11 +20,11 @@ * 02110-1301 USA. */ -package com.metamatrix.cdk.unittest; +package org.teiid.cdk.unittest; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.query.unittest.FakeMetadataFactory; -import com.metamatrix.cdk.api.TranslationUtility; public class FakeTranslationFactory { Copied: trunk/metadata/src/test/java/org/teiid/core/util (from rev 2211, trunk/metadata/src/test/java/com/metamatrix/core/util) Modified: trunk/metadata/src/test/java/org/teiid/core/util/TestCharOperation.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/core/util/TestCharOperation.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/metadata/src/test/java/org/teiid/core/util/TestCharOperation.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.core.util; +package org.teiid.core.util; import org.teiid.internal.core.index.CharOperation; Copied: trunk/metadata/src/test/java/org/teiid/internal/core/index (from rev 2211, trunk/metadata/src/test/java/com/metamatrix/internal/core/index) Modified: trunk/metadata/src/test/java/org/teiid/internal/core/index/TestGammaCompressedIndexBlock.java =================================================================== --- trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGammaCompressedIndexBlock.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/metadata/src/test/java/org/teiid/internal/core/index/TestGammaCompressedIndexBlock.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.internal.core.index; +package org.teiid.internal.core.index; import junit.framework.TestCase; Copied: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer (from rev 2211, trunk/runtime/src/test/java/com/metamatrix/dqp/service/buffer) Modified: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java =================================================================== --- trunk/runtime/src/test/java/com/metamatrix/dqp/service/buffer/TestLocalBufferService.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ -package com.metamatrix.dqp.service.buffer; +package org.teiid.dqp.service.buffer; import org.teiid.common.buffer.impl.BufferManagerImpl; import org.teiid.common.buffer.impl.FileStorageManager; Copied: trunk/test-integration/common/src/test/java/org/teiid/cdk/api (from rev 2211, trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api) Modified: trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java =================================================================== --- trunk/test-integration/common/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2010-06-09 16:37:31 UTC (rev 2211) +++ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/TestTranslationUtility.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -20,10 +20,11 @@ * 02110-1301 USA. */ -package com.metamatrix.cdk.api; +package org.teiid.cdk.api; import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.Command; import org.teiid.language.NamedTable; Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/language/TestLanguageUtil.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,6 +27,8 @@ import java.util.List; import java.util.Set; +import org.teiid.cdk.api.TranslationUtility; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.language.Condition; import org.teiid.language.LanguageFactory; import org.teiid.language.LanguageUtil; @@ -35,8 +37,6 @@ import junit.framework.TestCase; -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; /** */ Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestElement.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,6 +27,7 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.ColumnReference; import org.teiid.language.DerivedColumn; @@ -35,7 +36,6 @@ import org.teiid.metadata.BaseColumn.NullType; import org.teiid.metadata.Column.SearchType; -import com.metamatrix.cdk.api.TranslationUtility; /** */ Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestGroup.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,12 +27,12 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.NamedTable; import org.teiid.language.Select; import org.teiid.metadata.Table; -import com.metamatrix.cdk.api.TranslationUtility; /** */ Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -26,6 +26,7 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.Call; import org.teiid.language.ColumnReference; @@ -37,7 +38,6 @@ import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.Table; -import com.metamatrix.cdk.api.TranslationUtility; /** */ Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestParams.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,6 +27,7 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.Argument; import org.teiid.language.Call; @@ -34,7 +35,6 @@ import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.BaseColumn.NullType; -import com.metamatrix.cdk.api.TranslationUtility; /** Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestProcedure.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -27,13 +27,13 @@ import junit.framework.TestCase; +import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.util.UnitTestUtil; import org.teiid.language.Call; import org.teiid.metadata.Column; import org.teiid.metadata.Procedure; import org.teiid.metadata.ProcedureParameter; -import com.metamatrix.cdk.api.TranslationUtility; /** */ Modified: trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java 2010-06-10 17:04:23 UTC (rev 2216) +++ trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/TestSQLStringVisitor.java 2010-06-10 21:59:07 UTC (rev 2217) @@ -31,6 +31,7 @@ import java.util.List; import org.junit.Test; +import org.teiid.cdk.unittest.FakeTranslationFactory; import org.teiid.dqp.internal.datamgr.language.TestAggregateImpl; import org.teiid.dqp.internal.datamgr.language.TestCompareCriteriaImpl; import org.teiid.dqp.internal.datamgr.language.TestDeleteImpl; @@ -72,7 +73,6 @@ import org.teiid.query.sql.lang.CompareCriteria; import org.teiid.query.sql.lang.JoinType; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; public class TestSQLStringVisitor {